Moved database structure

diff --git a/database.sql b/database.sql
index 352f1d44ae71b303351a9a1c36508ad4fb7957ca..ca248875bf5793a239deb4986489fb6dbc0421fd 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -94,6 +94,18 @@ CREATE TABLE IF NOT EXISTS `user` (
        FOREIGN KEY (`parent-uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='The local users';
 
+--
+-- TABLE item-uri
+--
+CREATE TABLE IF NOT EXISTS `item-uri` (
+       `id` int unsigned NOT NULL auto_increment,
+       `uri` varbinary(255) NOT NULL COMMENT 'URI of an item',
+       `guid` varbinary(255) COMMENT 'A unique identifier for an item',
+        PRIMARY KEY(`id`),
+        UNIQUE INDEX `uri` (`uri`),
+        INDEX `guid` (`guid`)
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='URI and GUID for items';
+
 --
 -- TABLE contact
 --
@@ -209,18 +221,6 @@ CREATE TABLE IF NOT EXISTS `contact` (
        FOREIGN KEY (`gsid`) REFERENCES `gserver` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='contact table';
 
---
--- TABLE item-uri
---
-CREATE TABLE IF NOT EXISTS `item-uri` (
-       `id` int unsigned NOT NULL auto_increment,
-       `uri` varbinary(255) NOT NULL COMMENT 'URI of an item',
-       `guid` varbinary(255) COMMENT 'A unique identifier for an item',
-        PRIMARY KEY(`id`),
-        UNIQUE INDEX `uri` (`uri`),
-        INDEX `guid` (`guid`)
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='URI and GUID for items';
-
 --
 -- TABLE tag
 --

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 5a569b002c124ad590abac94063ff5492797c3c5..f15bc7075a68b8041bbea195fa19daad5b6d154b 100644 (file)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -152,6 +152,19 @@ return [
                        "email" => ["email(64)"],
                ]
        ],
+       "item-uri" => [
+               "comment" => "URI and GUID for items",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"],
+                       "uri" => ["type" => "varbinary(255)", "not null" => "1", "comment" => "URI of an item"],
+                       "guid" => ["type" => "varbinary(255)", "comment" => "A unique identifier for an item"]
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uri" => ["UNIQUE", "uri"],
+                       "guid" => ["guid"]
+               ]
+       ],
        "contact" => [
                "comment" => "contact table",
                "fields" => [
@@ -265,19 +278,6 @@ return [
                        "uri-id" => ["uri-id"],
                ]
        ],
-       "item-uri" => [
-               "comment" => "URI and GUID for items",
-               "fields" => [
-                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"],
-                       "uri" => ["type" => "varbinary(255)", "not null" => "1", "comment" => "URI of an item"],
-                       "guid" => ["type" => "varbinary(255)", "comment" => "A unique identifier for an item"]
-               ],
-               "indexes" => [
-                       "PRIMARY" => ["id"],
-                       "uri" => ["UNIQUE", "uri"],
-                       "guid" => ["guid"]
-               ]
-       ],
        "tag" => [
                "comment" => "tags and mentions",
                "fields" => [