mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #13364 from MrPetovan/bug/missing-user-gserver.gsid-key

Browse source 
[Database 1528] Add expected index for foreign key user-gserver.gsid
This commit is contained in:
Michael Vogel 2023-08-21 14:41:49 +02:00 committed by GitHub
parent e9861b11f3 76cc8eaff8
commit 0219d200a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
database.sql
View file

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2023.09-dev (Giant Rhubarb) -- Friendica 2023.09-dev (Giant Rhubarb)
-- DB_UPDATE_VERSION 1527 -- DB_UPDATE_VERSION 1528
-- ------------------------------------------ -- ------------------------------------------
@ -109,6 +109,7 @@ CREATE TABLE IF NOT EXISTS `user-gserver` (
`gsid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Gserver id', `gsid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Gserver id',
`ignored` boolean NOT NULL DEFAULT '0' COMMENT 'server accounts are ignored for the user', `ignored` boolean NOT NULL DEFAULT '0' COMMENT 'server accounts are ignored for the user',
PRIMARY KEY(`uid`,`gsid`), PRIMARY KEY(`uid`,`gsid`),
INDEX `gsid` (`gsid`),
FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE, FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
FOREIGN KEY (`gsid`) REFERENCES `gserver` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE FOREIGN KEY (`gsid`) REFERENCES `gserver` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User settings about remote servers'; ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User settings about remote servers';

1
doc/database/db_user-gserver.md
View file

@ -18,6 +18,7 @@ Indexes
| Name | Fields | | Name | Fields |
| ------- | --------- | | ------- | --------- |
| PRIMARY | uid, gsid | | PRIMARY | uid, gsid |
| gsid | gsid |
Foreign Keys Foreign Keys
------------ ------------

3
static/dbstructure.config.php
View file

@ -56,7 +56,7 @@ use Friendica\Database\DBA;
// This file is required several times during the test in DbaDefinition which justifies this condition // This file is required several times during the test in DbaDefinition which justifies this condition
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1527); define('DB_UPDATE_VERSION', 1528);
} }
return [ return [
@ -168,6 +168,7 @@ return [
], ],
"indexes" => [ "indexes" => [
"PRIMARY" => ["uid", "gsid"], "PRIMARY" => ["uid", "gsid"],
"gsid" => ["gsid"]
], ],
], ],
"item-uri" => [ "item-uri" => [