Moved table

diff --git a/database.sql b/database.sql
index 771174719c8ee6c4459863c29785ef4f5625f9f8..0c9f367fafa8f7a4c0cf35d97c028f136ffac194 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -248,6 +248,15 @@ CREATE TABLE IF NOT EXISTS `permissionset` (
        FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='';
 
+--
+-- TABLE verb
+--
+CREATE TABLE IF NOT EXISTS `verb` (
+       `id` smallint unsigned NOT NULL auto_increment,
+       `name` varchar(100) NOT NULL DEFAULT '' COMMENT '',
+        PRIMARY KEY(`id`)
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Activity Verbs';
+
 --
 -- TABLE 2fa_app_specific_password
 --
@@ -661,7 +670,7 @@ CREATE TABLE IF NOT EXISTS `item` (
        `author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the author of this item',
        `causer-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the contact that caused the item creation',
        `icid` int unsigned COMMENT 'Id of the item-content table entry that contains the whole item content',
-       `vid` int unsigned COMMENT 'Id of the verb table entry that contains the activity verbs',
+       `vid` smallint unsigned COMMENT 'Id of the verb table entry that contains the activity verbs',
        `extid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `post-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Post type (personal note, bookmark, ...)',
        `global` boolean NOT NULL DEFAULT '0' COMMENT '',
@@ -1426,15 +1435,6 @@ CREATE TABLE IF NOT EXISTS `user-item` (
        FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User specific item data';
 
---
--- TABLE verb
---
-CREATE TABLE IF NOT EXISTS `verb` (
-       `id` int unsigned NOT NULL auto_increment,
-       `name` varchar(100) NOT NULL DEFAULT '' COMMENT '',
-        PRIMARY KEY(`id`)
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Activity Verbs';
-
 --
 -- TABLE worker-ipc
 --

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index feef8cf0d88b41dff7d1ef613a4bd694d0dd69e2..3524fcab207f8db8d1695a243b69eb8aed7242ad 100644 (file)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -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",
@@ -726,7 +736,7 @@ return [
                        "author-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the author of this item"],
                        "causer-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the contact that caused the item creation"],
                        "icid" => ["type" => "int unsigned", "relation" => ["item-content" => "id"], "comment" => "Id of the item-content table entry that contains the whole item content"],
-                       "vid" => ["type" => "int unsigned", "foreign" => ["verb" => "id", "on delete" => "restrict"], "comment" => "Id of the verb table entry that contains the activity verbs"],
+                       "vid" => ["type" => "smallint unsigned", "foreign" => ["verb" => "id", "on delete" => "restrict"], "comment" => "Id of the verb table entry that contains the activity verbs"],
                        "extid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
                        "post-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "Post type (personal note, bookmark, ...)"],
                        "global" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
@@ -1469,16 +1479,6 @@ return [
                        "iid_uid" => ["iid", "uid"]
                ]
        ],
-       "verb" => [
-               "comment" => "Activity Verbs",
-               "fields" => [
-                       "id" => ["type" => "int 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" => [