Merge pull request #6987 from tobiasd/20190408-dbupdateemail

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index 272d02de6cc31588741e069bf2db9364e25d369c..9c4af9a43f9278afcfc183ba808783117e5041a8 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 1309
 -- ------------------------------------------
 
 
@@ -480,6 +480,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 +1027,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 +1094,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)),