X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=database.sql;h=9ffa3544acec3a76a45e2e62fde6dad1af178e4e;hb=c3d836db631b002108789238f45478e9245bfb16;hp=02481bc007f177f1371a9c63a2999aa528bafb0c;hpb=259b99e6e94cd6714e65bb128af9cbe776fd3325;p=friendica.git

diff --git a/database.sql b/database.sql
index 02481bc007..9ffa3544ac 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2023.03-dev (Giant Rhubarb)
--- DB_UPDATE_VERSION 1506
+-- DB_UPDATE_VERSION 1509
 -- ------------------------------------------
 
 
@@ -494,18 +494,6 @@ CREATE TABLE IF NOT EXISTS `cache` (
 	 INDEX `k_expires` (`k`,`expires`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Stores temporary data';
 
---
--- TABLE config
---
-CREATE TABLE IF NOT EXISTS `config` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
-	`cat` varbinary(50) NOT NULL DEFAULT '' COMMENT '',
-	`k` varbinary(50) NOT NULL DEFAULT '' COMMENT '',
-	`v` mediumtext COMMENT '',
-	 PRIMARY KEY(`id`),
-	 UNIQUE INDEX `cat_k` (`cat`,`k`)
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='main configuration storage';
-
 --
 -- TABLE contact-relation
 --
@@ -583,11 +571,11 @@ CREATE TABLE IF NOT EXISTS `delayed-post` (
 -- TABLE delivery-queue
 --
 CREATE TABLE IF NOT EXISTS `delivery-queue` (
-	`gsid` int unsigned NOT NULL COMMENT 'Global Server ID',
-	`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
+	`gsid` int unsigned NOT NULL COMMENT 'Target server',
+	`uri-id` int unsigned NOT NULL COMMENT 'Delivered post',
 	`created` datetime COMMENT '',
 	`command` varbinary(32) COMMENT '',
-	`cid` int unsigned COMMENT 'contact_id (ID of the contact in contact table)',
+	`cid` int unsigned COMMENT 'Target contact',
 	`uid` mediumint unsigned COMMENT 'Delivering user',
 	`failed` tinyint DEFAULT 0 COMMENT 'Number of times the delivery has failed',
 	 PRIMARY KEY(`uri-id`,`gsid`),
@@ -824,6 +812,7 @@ CREATE TABLE IF NOT EXISTS `inbox-entry-receiver` (
 CREATE TABLE IF NOT EXISTS `inbox-status` (
 	`url` varbinary(383) NOT NULL COMMENT 'URL of the inbox',
 	`uri-id` int unsigned COMMENT 'Item-uri id of inbox url',
+	`gsid` int unsigned COMMENT 'ID of the related server',
 	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation date of this entry',
 	`success` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last successful delivery',
 	`failure` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last failed delivery',
@@ -832,7 +821,9 @@ CREATE TABLE IF NOT EXISTS `inbox-status` (
 	`shared` boolean NOT NULL DEFAULT '0' COMMENT 'Is it a shared inbox?',
 	 PRIMARY KEY(`url`),
 	 INDEX `uri-id` (`uri-id`),
-	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
+	 INDEX `gsid` (`gsid`),
+	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`gsid`) REFERENCES `gserver` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Status of ActivityPub inboxes';
 
 --