Merge remote-tracking branch 'upstream/develop' into rework-notifications

[friendica.git] / static / dbstructure.config.php

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 990835fe8b12cce8668b213c773c21403fe7cf7a..41c8af1de2f5308d4c0fe097f046248500c16c78 100644 (file)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -55,7 +55,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1377);
+       define('DB_UPDATE_VERSION', 1380);
 }
 
 return [
@@ -234,14 +234,14 @@ return [
                        "PRIMARY" => ["id"],
                        "uid_name" => ["uid", "name(190)"],
                        "self_uid" => ["self", "uid"],
-                       "alias_uid" => ["alias(96)", "uid"],
+                       "alias_uid" => ["alias(128)", "uid"],
                        "pending_uid" => ["pending", "uid"],
                        "blocked_uid" => ["blocked", "uid"],
                        "uid_rel_network_poll" => ["uid", "rel", "network", "poll(64)", "archive"],
                        "uid_network_batch" => ["uid", "network", "batch(64)"],
-                       "addr_uid" => ["addr(96)", "uid"],
-                       "nurl_uid" => ["nurl(96)", "uid"],
-                       "nick_uid" => ["nick(32)", "uid"],
+                       "addr_uid" => ["addr(128)", "uid"],
+                       "nurl_uid" => ["nurl(128)", "uid"],
+                       "nick_uid" => ["nick(128)", "uid"],
                        "attag_uid" => ["attag(96)", "uid"],
                        "dfrn-id" => ["dfrn-id(64)"],
                        "issued-id" => ["issued-id(64)"],
@@ -307,6 +307,16 @@ return [
                        "uid_allow_cid_allow_gid_deny_cid_deny_gid" => ["uid", "allow_cid(50)", "allow_gid(30)", "deny_cid(50)", "deny_gid(30)"],
                ]
        ],
+       "verb" => [
+               "comment" => "Activity Verbs",
+               "fields" => [
+                       "id" => ["type" => "smallint unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"],
+                       "name" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => ""]
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"]
+               ]
+       ],
        // Main tables
        "2fa_app_specific_password" => [
                "comment" => "Two-factor app-specific _password",
@@ -385,6 +395,7 @@ return [
                        "alias" => ["alias(190)"],
                        "followers" => ["followers(190)"],
                        "baseurl" => ["baseurl(190)"],
+                       "sharedinbox" => ["sharedinbox(190)"],
                        "gsid" => ["gsid"]
                ]
        ],
@@ -1071,7 +1082,7 @@ return [
                "comment" => "photo storage",
                "fields" => [
                        "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
-                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner User id"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid", "on delete" => "restrict"], "comment" => "Owner User id"],
                        "contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "contact.id"],
                        "guid" => ["type" => "char(16)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this photo"],
                        "resource-id" => ["type" => "char(32)", "not null" => "1", "default" => "", "comment" => ""],
@@ -1469,16 +1480,6 @@ return [
                        "iid_uid" => ["iid", "uid"]
                ]
        ],
-       "verb" => [
-               "comment" => "Activity Verbs",
-               "fields" => [
-                       "id" => ["type" => "smallint unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"],
-                       "name" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => ""]
-               ],
-               "indexes" => [
-                       "PRIMARY" => ["id"]
-               ]
-       ],
        "worker-ipc" => [
                "comment" => "Inter process communication between the frontend and the worker",
                "fields" => [