Fix fatal error

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index eb97ec307447a3b1e4085ae190176c202c0f8ff0..02e21f137ece7c967386a543059183ffcd014c8c 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2022.09-dev (Giant Rhubarb)
--- DB_UPDATE_VERSION 1474
+-- DB_UPDATE_VERSION 1475
 -- ------------------------------------------
 
 
@@ -338,6 +338,7 @@ CREATE TABLE IF NOT EXISTS `apcontact` (
        `featured-tags` varchar(255) COMMENT 'Address for the collection of featured tags',
        `manually-approve` boolean COMMENT '',
        `discoverable` boolean COMMENT 'Mastodon extension: true if profile is published in their directory',
+       `suspended` boolean COMMENT 'Mastodon extension: true if profile is suspended',
        `nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `name` varchar(255) COMMENT '',
        `about` text COMMENT '',
@@ -503,23 +504,6 @@ CREATE TABLE IF NOT EXISTS `conv` (
        FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='private messages';
 
---
--- TABLE conversation
---
-CREATE TABLE IF NOT EXISTS `conversation` (
-       `item-uri` varbinary(255) NOT NULL COMMENT 'Original URI of the item - unrelated to the table with the same name',
-       `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 255 COMMENT 'The protocol of the item',
-       `direction` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'How the message arrived here: 1=push, 2=pull',
-       `source` mediumtext COMMENT 'Original source',
-       `received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Receiving date',
-        PRIMARY KEY(`item-uri`),
-        INDEX `conversation-uri` (`conversation-uri`),
-        INDEX `received` (`received`)
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Raw data and structure information for messages';
-
 --
 -- TABLE workerqueue
 --
@@ -732,13 +716,15 @@ CREATE TABLE IF NOT EXISTS `inbox-entry` (
        `activity-id` varbinary(255) COMMENT 'id of the incoming activity',
        `object-id` varbinary(255) COMMENT '',
        `in-reply-to-id` varbinary(255) COMMENT '',
+       `conversation` varbinary(255) COMMENT '',
        `type` varchar(64) COMMENT 'Type of the activity',
        `object-type` varchar(64) COMMENT 'Type of the object activity',
        `object-object-type` varchar(64) COMMENT 'Type of the object\'s object activity',
        `received` datetime COMMENT 'Receiving date',
        `activity` mediumtext COMMENT 'The JSON activity',
        `signer` varchar(255) COMMENT '',
-       `push` boolean NOT NULL DEFAULT '0' COMMENT '',
+       `push` boolean COMMENT 'Is the entry pushed or have pulled it?',
+       `trust` boolean COMMENT 'Do we trust this entry?',
        `wid` int unsigned COMMENT 'Workerqueue id',
         PRIMARY KEY(`id`),
         UNIQUE INDEX `activity-id` (`activity-id`),
@@ -1115,6 +1101,17 @@ CREATE TABLE IF NOT EXISTS `post` (
        FOREIGN KEY (`vid`) REFERENCES `verb` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Structure for all posts';
 
+--
+-- TABLE post-activity
+--
+CREATE TABLE IF NOT EXISTS `post-activity` (
+       `uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
+       `activity` mediumtext COMMENT 'Original activity',
+       `received` datetime COMMENT '',
+        PRIMARY KEY(`uri-id`),
+       FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Original remote activity';
+
 --
 -- TABLE post-category
 --