X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=database.sql;h=9bbc056d62efb63b98be9b6650aad7d6e1735540;hb=620395378e2397de1a99877b2ebcf917742807d2;hp=60d4b1c88e0429159f1983c96be2e296bbecd317;hpb=71ec84f6dc83f753fe80170cfdfd32d202850d90;p=friendica.git

diff --git a/database.sql b/database.sql
index 60d4b1c88e..9bbc056d62 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
--- Friendica 2018.08-dev (The Tazmans Flax-lily)
--- DB_UPDATE_VERSION 1283
+-- Friendica 2018.12-dev (The Tazmans Flax-lily)
+-- DB_UPDATE_VERSION 1290
 -- ------------------------------------------
 
 
@@ -19,6 +19,33 @@ CREATE TABLE IF NOT EXISTS `addon` (
 	 UNIQUE INDEX `name` (`name`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='registered addons';
 
+--
+-- TABLE apcontact
+--
+CREATE TABLE IF NOT EXISTS `apcontact` (
+	`url` varbinary(255) NOT NULL COMMENT 'URL of the contact',
+	`uuid` varchar(255) COMMENT '',
+	`type` varchar(20) NOT NULL COMMENT '',
+	`following` varchar(255) COMMENT '',
+	`followers` varchar(255) COMMENT '',
+	`inbox` varchar(255) NOT NULL COMMENT '',
+	`outbox` varchar(255) COMMENT '',
+	`sharedinbox` varchar(255) COMMENT '',
+	`nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`name` varchar(255) COMMENT '',
+	`about` text COMMENT '',
+	`photo` varchar(255) COMMENT '',
+	`addr` varchar(255) COMMENT '',
+	`alias` varchar(255) COMMENT '',
+	`pubkey` text COMMENT '',
+	`baseurl` varchar(255) COMMENT 'baseurl of the ap contact',
+	`updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	 PRIMARY KEY(`url`),
+	 INDEX `addr` (`addr`(32)),
+	 INDEX `alias` (`alias`(190)),
+	 INDEX `url` (`followers`(190))
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='ActivityPub compatible contacts - used in the ActivityPub implementation';
+
 --
 -- TABLE attach
 --
@@ -163,6 +190,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	`hidden` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`archive` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`pending` boolean NOT NULL DEFAULT '1' COMMENT '',
+	`deleted` boolean NOT NULL DEFAULT '0' COMMENT 'Contact has been deleted',
 	`rating` tinyint NOT NULL DEFAULT 0 COMMENT '',
 	`reason` text COMMENT '',
 	`closeness` tinyint unsigned NOT NULL DEFAULT 99 COMMENT '',
@@ -212,7 +240,7 @@ CREATE TABLE IF NOT EXISTS `conversation` (
 	`reply-to-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT 'URI to which this item is a reply',
 	`conversation-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT 'GNU Social conversation URI',
 	`conversation-href` varbinary(255) NOT NULL DEFAULT '' COMMENT 'GNU Social conversation link',
-	`protocol` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'The protocol of the item',
+	`protocol` tinyint unsigned NOT NULL DEFAULT 255 COMMENT 'The protocol of the item',
 	`source` mediumtext COMMENT 'Original source',
 	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Receiving date',
 	 PRIMARY KEY(`item-uri`),
@@ -220,6 +248,15 @@ CREATE TABLE IF NOT EXISTS `conversation` (
 	 INDEX `received` (`received`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Raw data and structure information for messages';
 
+--
+-- TABLE diaspora-interaction
+--
+CREATE TABLE IF NOT EXISTS `diaspora-interaction` (
+	`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
+	`interaction` mediumtext COMMENT 'The Diaspora interaction',
+	 PRIMARY KEY(`uri-id`)
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Signed Diaspora Interaction';
+
 --
 -- TABLE event
 --
@@ -562,7 +599,8 @@ CREATE TABLE IF NOT EXISTS `item-activity` (
 	`activity` smallint unsigned NOT NULL DEFAULT 0 COMMENT '',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `uri-hash` (`uri-hash`),
-	 INDEX `uri` (`uri`(191))
+	 INDEX `uri` (`uri`(191)),
+	 INDEX `uri-id` (`uri-id`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Activities for items';
 
 --
@@ -590,7 +628,8 @@ CREATE TABLE IF NOT EXISTS `item-content` (
 	`verb` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams verb',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `uri-plink-hash` (`uri-plink-hash`),
-	 INDEX `uri` (`uri`(191))
+	 INDEX `uri` (`uri`(191)),
+	 INDEX `uri-id` (`uri-id`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Content for all posts';
 
 --
@@ -1215,12 +1254,17 @@ CREATE TABLE IF NOT EXISTS `workerqueue` (
 	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation date',
 	`pid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Process id of the worker',
 	`executed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Execution date',
+	`next_try` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Next retrial date',
+	`retrial` tinyint NOT NULL DEFAULT 0 COMMENT 'Retrial counter',
 	`done` boolean NOT NULL DEFAULT '0' COMMENT 'Marked 1 when the task was done - will be deleted later',
 	 PRIMARY KEY(`id`),
 	 INDEX `pid` (`pid`),
 	 INDEX `parameter` (`parameter`(64)),
-	 INDEX `priority_created` (`priority`,`created`),
-	 INDEX `done_executed` (`done`,`executed`)
+	 INDEX `priority_created_next_try` (`priority`,`created`,`next_try`),
+	 INDEX `done_priority_executed_next_try` (`done`,`priority`,`executed`,`next_try`),
+	 INDEX `done_executed_next_try` (`done`,`executed`,`next_try`),
+	 INDEX `done_priority_next_try` (`done`,`priority`,`next_try`),
+	 INDEX `done_next_try` (`done`,`next_try`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Background tasks queue entries';