Merge pull request #7277 from annando/ignore-resharer

[friendica.git/.git] / database.sql

diff --git a/database.sql b/database.sql
index 272d02d..dde37cd 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
--- Friendica 2019.03 (Dalmatian Bellflower)
--- DB_UPDATE_VERSION 1305
+-- Friendica 2019.06-dev (Dalmatian Bellflower)
+-- DB_UPDATE_VERSION 1311
 -- ------------------------------------------
 
 
@@ -40,6 +40,7 @@ CREATE TABLE IF NOT EXISTS `apcontact` (
        `alias` varchar(255) COMMENT '',
        `pubkey` text COMMENT '',
        `baseurl` varchar(255) COMMENT 'baseurl of the ap contact',
+       `generator` varchar(255) COMMENT 'Name of the contact\'s system',
        `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
         PRIMARY KEY(`url`),
         INDEX `addr` (`addr`(32)),
@@ -138,14 +139,16 @@ CREATE TABLE IF NOT EXISTS `contact` (
        `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
        `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
        `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+       `updated` datetime DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last contact update',
        `self` boolean NOT NULL DEFAULT '0' COMMENT '1 if the contact is the user him/her self',
        `remote_self` boolean NOT NULL DEFAULT '0' COMMENT '',
        `rel` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'The kind of the relation between the user and the contact',
        `duplex` boolean NOT NULL DEFAULT '0' COMMENT '',
-       `network` char(4) NOT NULL DEFAULT '' COMMENT 'Network protocol of the contact',
+       `network` char(4) NOT NULL DEFAULT '' COMMENT 'Network of the contact',
+       `protocol` char(4) NOT NULL DEFAULT '' COMMENT 'Protocol of the contact',
        `name` varchar(255) NOT NULL DEFAULT '' COMMENT 'Name that this contact is known by',
        `nick` varchar(255) NOT NULL DEFAULT '' COMMENT 'Nick- and user name of the contact',
-       `location` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+       `location` varchar(255) DEFAULT '' COMMENT '',
        `about` text COMMENT '',
        `keywords` text COMMENT 'public keywords (interests) of the contact',
        `gender` varchar(32) NOT NULL DEFAULT '' COMMENT '',
@@ -480,6 +483,7 @@ CREATE TABLE IF NOT EXISTS `inbox-status` (
        `failure` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last failed delivery',
        `previous` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Previous delivery date',
        `archive` boolean NOT NULL DEFAULT '0' COMMENT 'Is the inbox archived?',
+       `shared` boolean NOT NULL DEFAULT '0' COMMENT 'Is it a shared inbox?',
         PRIMARY KEY(`url`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Status of ActivityPub inboxes';
 
@@ -1026,25 +1030,6 @@ CREATE TABLE IF NOT EXISTS `push_subscriber` (
         INDEX `next_try` (`next_try`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Used for OStatus: Contains feed subscribers';
 
---
--- TABLE queue
---
-CREATE TABLE IF NOT EXISTS `queue` (
-       `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
-       `cid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Message receiver',
-       `network` char(4) NOT NULL DEFAULT '' COMMENT 'Receiver\'s network',
-       `guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'Unique GUID of the message',
-       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date, when the message was created',
-       `last` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last trial',
-       `next` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Next retrial date',
-       `retrial` tinyint NOT NULL DEFAULT 0 COMMENT 'Retrial counter',
-       `content` mediumtext COMMENT '',
-       `batch` boolean NOT NULL DEFAULT '0' COMMENT '',
-        PRIMARY KEY(`id`),
-        INDEX `last` (`last`),
-        INDEX `next` (`next`)
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Queue for messages that couldn\'t be delivered';
-
 --
 -- TABLE register
 --
@@ -1112,7 +1097,7 @@ CREATE TABLE IF NOT EXISTS `term` (
        `global` boolean NOT NULL DEFAULT '0' COMMENT '',
        `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
         PRIMARY KEY(`tid`),
-        INDEX `term_type` (`term`(64), `type`),
+        INDEX `term_type` (`term`(64),`type`),
         INDEX `oid_otype_type_term` (`oid`,`otype`,`type`,`term`(32)),
         INDEX `uid_otype_type_term_global_created` (`uid`,`otype`,`type`,`term`(32),`global`,`created`),
         INDEX `uid_otype_type_url` (`uid`,`otype`,`type`,`url`(64)),