Fix for not being able to delete items

[friendica.git] / src / Database / DBStructure.php

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 5d527aac60a50dfbcd3ec057628fd613e0d86d23..41543d89ccd6b0161b9cfe708b58cb35a85044b1 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -207,7 +207,7 @@ class DBStructure
        public static function update($verbose, $action, $install = false, array $tables = null, array $definition = null) {
                if ($action && !$install) {
                        Config::set('system', 'maintenance', 1);
-                       Config::set('system', 'maintenance_reason', L10n::t(': Database update', DBM::date().' '.date('e')));
+                       Config::set('system', 'maintenance_reason', L10n::t('%s: Database update', DBM::date().' '.date('e')));
                }
 
                $errors = '';
@@ -1074,6 +1074,8 @@ class DBStructure
                                                "noscrape" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
                                                "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
                                                "platform" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                                               "relay-subscribe" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Has the server subscribed to the relay system"],
+                                               "relay-scope" => ["type" => "varchar(10)", "not null" => "1", "default" => "", "comment" => "The scope of messages that the server wants to get"],
                                                "created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
                                                "last_poco_query" => ["type" => "datetime", "default" => NULL_DATE, "comment" => ""],
                                                "last_contact" => ["type" => "datetime", "default" => NULL_DATE, "comment" => ""],
@@ -1084,6 +1086,17 @@ class DBStructure
                                                "nurl" => ["UNIQUE", "nurl(190)"],
                                                ]
                                ];
+               $database["gserver-tag"] = [
+                               "comment" => "Tags that the server has subscribed",
+                               "fields" => [
+                                               "gserver-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["gserver" => "id"], "primary" => "1", "comment" => "The id of the gserver"],
+                                               "tag" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "primary" => "1", "comment" => "Tag that the server has subscribed"],
+                                               ],
+                               "indexes" => [
+                                               "PRIMARY" => ["gserver-id", "tag"],
+                                               "tag" => ["tag"],
+                                               ]
+                               ];
                $database["hook"] = [
                                "comment" => "addon hook registry",
                                "fields" => [
@@ -1540,12 +1553,15 @@ class DBStructure
                                                "callback_url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
                                                "topic" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
                                                "nickname" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-                                               "push" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-                                               "last_update" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
+                                               "push" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => "Retrial counter"],
+                                               "last_update" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date of last successful trial"],
+                                               "next_try" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Next retrial date"],
+                                               "renewed" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date of last subscription renewal"],
                                                "secret" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
                                                ],
                                "indexes" => [
                                                "PRIMARY" => ["id"],
+                                               "next_try" => ["next_try"],
                                                ]
                                ];
                $database["queue"] = [
@@ -1770,6 +1786,17 @@ class DBStructure
                                                "username" => ["username(32)"],
                                                ]
                                ];
+               $database["user-item"] = [
+                               "comment" => "User specific item data",
+                               "fields" => [
+                                               "iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["item" => "id"], "comment" => "Item id"],
+                                               "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["user" => "uid"], "comment" => "User id"],
+                                               "hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Hidden marker"],
+                                               ],
+                               "indexes" => [
+                                               "PRIMARY" => ["uid", "iid"],
+                                               ]
+                               ];
                $database["workerqueue"] = [
                                "comment" => "Background tasks queue entries",
                                "fields" => [
@@ -1786,10 +1813,12 @@ class DBStructure
                                                "pid" => ["pid"],
                                                "parameter" => ["parameter(64)"],
                                                "priority_created" => ["priority", "created"],
-                                               "executed" => ["executed"],
+                                               "done_executed" => ["done", "executed"],
                                                ]
                                ];
 
+               \Friendica\Core\Addon::callHooks('dbstructure_definition', $database);
+
                return $database;
        }
 }