X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=database.sql;h=7c0a593795e342c48be493469d6b3730e11ad15c;hb=bdbc51229aa647154dae57d7b3d00f7ff5d7324e;hp=606ac6d81452b1c8742eb2679801c0c88c7dfce0;hpb=5a30dfcf34b1c739e5b0f42192b363aae60e0b1e;p=friendica.git diff --git a/database.sql b/database.sql index 606ac6d814..7c0a593795 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ --- Friendica 3.6-dev (Asparagus) --- DB_UPDATE_VERSION 1254 +-- Friendica 2018.05-rc (The Tazmans Flax-lily) +-- DB_UPDATE_VERSION 1266 -- ------------------------------------------ @@ -55,12 +55,12 @@ CREATE TABLE IF NOT EXISTS `auth_codes` ( -- TABLE cache -- CREATE TABLE IF NOT EXISTS `cache` ( - `k` varbinary(255) NOT NULL COMMENT '', - `v` mediumtext COMMENT '', - `expire_mode` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '', - `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', + `k` varbinary(255) NOT NULL COMMENT 'cache key', + `v` mediumtext COMMENT 'cached serialized value', + `expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of cache expiration', + `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of cache insertion', PRIMARY KEY(`k`), - INDEX `expire_mode_updated` (`expire_mode`,`updated`) + INDEX `k_expires` (`k`,`expires`) ) DEFAULT COLLATE utf8mb4_general_ci; -- @@ -122,9 +122,9 @@ CREATE TABLE IF NOT EXISTS `contact` ( `xmpp` varchar(255) NOT NULL DEFAULT '' COMMENT '', `attag` varchar(255) NOT NULL DEFAULT '' COMMENT '', `avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `photo` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `thumb` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `micro` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `photo` varchar(255) DEFAULT '' COMMENT '', + `thumb` varchar(255) DEFAULT '' COMMENT '', + `micro` varchar(255) DEFAULT '' COMMENT '', `site-pubkey` text COMMENT '', `issued-id` varchar(255) NOT NULL DEFAULT '' COMMENT '', `dfrn-id` varchar(255) NOT NULL DEFAULT '' COMMENT '', @@ -397,6 +397,8 @@ CREATE TABLE IF NOT EXISTS `gserver` ( `noscrape` varchar(255) NOT NULL DEFAULT '' COMMENT '', `network` char(4) NOT NULL DEFAULT '' COMMENT '', `platform` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `relay-subscribe` boolean NOT NULL DEFAULT '0' COMMENT 'Has the server subscribed to the relay system', + `relay-scope` varchar(10) NOT NULL DEFAULT '' COMMENT 'The scope of messages that the server wants to get', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `last_poco_query` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '', `last_contact` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '', @@ -405,6 +407,16 @@ CREATE TABLE IF NOT EXISTS `gserver` ( UNIQUE INDEX `nurl` (`nurl`(190)) ) DEFAULT COLLATE utf8mb4_general_ci; +-- +-- TABLE gserver-tag +-- +CREATE TABLE IF NOT EXISTS `gserver-tag` ( + `gserver-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'The id of the gserver', + `tag` varchar(100) NOT NULL DEFAULT '' COMMENT 'Tag that the server has subscribed', + PRIMARY KEY(`gserver-id`,`tag`), + INDEX `tag` (`tag`) +) DEFAULT COLLATE utf8mb4_general_ci; + -- -- TABLE hook -- @@ -445,7 +457,6 @@ CREATE TABLE IF NOT EXISTS `item` ( `uri` varchar(255) NOT NULL DEFAULT '' COMMENT '', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id', `contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT '', - `gcontact-id` int unsigned NOT NULL DEFAULT 0 COMMENT '', `type` varchar(20) NOT NULL DEFAULT '' COMMENT '', `wall` boolean NOT NULL DEFAULT '0' COMMENT '', `gravity` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '', @@ -467,6 +478,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `author-link` varchar(255) NOT NULL DEFAULT '' COMMENT '', `author-avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '', `title` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `content-warning` varchar(255) NOT NULL DEFAULT '' COMMENT '', `body` mediumtext COMMENT '', `app` varchar(255) NOT NULL DEFAULT '' COMMENT '', `verb` varchar(100) NOT NULL DEFAULT '' COMMENT '', @@ -513,6 +525,7 @@ CREATE TABLE IF NOT EXISTS `item` ( INDEX `uid_id` (`uid`,`id`), INDEX `uid_contactid_id` (`uid`,`contact-id`,`id`), INDEX `uid_created` (`uid`,`created`), + INDEX `uid_commented` (`uid`,`commented`), INDEX `uid_unseen_contactid` (`uid`,`unseen`,`contact-id`), INDEX `uid_network_received` (`uid`,`network`,`received`), INDEX `uid_network_commented` (`uid`,`network`,`commented`), @@ -842,10 +855,13 @@ CREATE TABLE IF NOT EXISTS `push_subscriber` ( `callback_url` varchar(255) NOT NULL DEFAULT '' COMMENT '', `topic` varchar(255) NOT NULL DEFAULT '' COMMENT '', `nickname` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `push` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '', - `last_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', + `push` tinyint NOT NULL DEFAULT 0 COMMENT 'Retrial counter', + `last_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last successful trial', + `next_try` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Next retrial date', + `renewed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last subscription renewal', `secret` varchar(255) NOT NULL DEFAULT '' COMMENT '', - PRIMARY KEY(`id`) + PRIMARY KEY(`id`), + INDEX `next_try` (`next_try`) ) DEFAULT COLLATE utf8mb4_general_ci; -- @@ -948,7 +964,6 @@ CREATE TABLE IF NOT EXISTS `thread` ( `iid` int unsigned NOT NULL DEFAULT 0 COMMENT '', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id', `contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT '', - `gcontact-id` int unsigned NOT NULL DEFAULT 0 COMMENT '', `owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT '', `author-id` int unsigned NOT NULL DEFAULT 0 COMMENT '', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', @@ -1061,6 +1076,16 @@ CREATE TABLE IF NOT EXISTS `userd` ( INDEX `username` (`username`(32)) ) DEFAULT COLLATE utf8mb4_general_ci; +-- +-- TABLE user-item +-- +CREATE TABLE IF NOT EXISTS `user-item` ( + `iid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item id', + `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id', + `hidden` boolean NOT NULL DEFAULT '0' COMMENT 'Hidden marker', + PRIMARY KEY(`uid`,`iid`) +) DEFAULT COLLATE utf8mb4_general_ci; + -- -- TABLE workerqueue -- @@ -1076,6 +1101,7 @@ CREATE TABLE IF NOT EXISTS `workerqueue` ( INDEX `pid` (`pid`), INDEX `parameter` (`parameter`(64)), INDEX `priority_created` (`priority`,`created`), - INDEX `executed` (`executed`) + INDEX `done_executed` (`done`,`executed`) ) DEFAULT COLLATE utf8mb4_general_ci; +