Merge pull request #13272 from annando/last-editor-uid
Fix "Cannot drop index 'last-editor-uid': needed in a foreign key constraint"
This commit is contained in:
commit
f604185b10
4 changed files with 17 additions and 6 deletions
11
database.sql
11
database.sql
|
@ -1712,6 +1712,7 @@ CREATE TABLE IF NOT EXISTS `report` (
|
||||||
INDEX `cid` (`cid`),
|
INDEX `cid` (`cid`),
|
||||||
INDEX `reporter-id` (`reporter-id`),
|
INDEX `reporter-id` (`reporter-id`),
|
||||||
INDEX `gsid` (`gsid`),
|
INDEX `gsid` (`gsid`),
|
||||||
|
INDEX `last-editor-uid` (`last-editor-uid`),
|
||||||
INDEX `assigned-uid` (`assigned-uid`),
|
INDEX `assigned-uid` (`assigned-uid`),
|
||||||
INDEX `status-resolution` (`status`,`resolution`),
|
INDEX `status-resolution` (`status`,`resolution`),
|
||||||
INDEX `created` (`created`),
|
INDEX `created` (`created`),
|
||||||
|
@ -2635,13 +2636,15 @@ CREATE VIEW `network-item-view` AS SELECT
|
||||||
`ownercontact`.`contact-type` AS `contact-type`
|
`ownercontact`.`contact-type` AS `contact-type`
|
||||||
FROM `post-user`
|
FROM `post-user`
|
||||||
INNER JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid`
|
INNER JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid`
|
||||||
INNER JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
|
STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
|
||||||
|
STRAIGHT_JOIN `contact` AS `authorcontact` ON `authorcontact`.`id` = `post-thread-user`.`author-id`
|
||||||
|
STRAIGHT_JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
||||||
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
||||||
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
||||||
INNER JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
|
||||||
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
||||||
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
||||||
AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
|
AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
|
||||||
|
AND NOT `authorcontact`.`blocked` AND NOT `ownercontact`.`blocked`
|
||||||
AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
|
AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
|
||||||
AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`);
|
AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`);
|
||||||
|
|
||||||
|
@ -2664,12 +2667,14 @@ CREATE VIEW `network-thread-view` AS SELECT
|
||||||
FROM `post-thread-user`
|
FROM `post-thread-user`
|
||||||
INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id`
|
INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id`
|
||||||
STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
|
STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
|
||||||
|
STRAIGHT_JOIN `contact` AS `authorcontact` ON `authorcontact`.`id` = `post-thread-user`.`author-id`
|
||||||
|
STRAIGHT_JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
||||||
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
||||||
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
||||||
LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
|
||||||
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
||||||
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
||||||
AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`)
|
AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`)
|
||||||
|
AND NOT `authorcontact`.`blocked` AND NOT `ownercontact`.`blocked`
|
||||||
AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
|
AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
|
||||||
AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`);
|
AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`);
|
||||||
|
|
||||||
|
|
|
@ -35,6 +35,7 @@ Indexes
|
||||||
| cid | cid |
|
| cid | cid |
|
||||||
| reporter-id | reporter-id |
|
| reporter-id | reporter-id |
|
||||||
| gsid | gsid |
|
| gsid | gsid |
|
||||||
|
| last-editor-uid | last-editor-uid |
|
||||||
| assigned-uid | assigned-uid |
|
| assigned-uid | assigned-uid |
|
||||||
| status-resolution | status, resolution |
|
| status-resolution | status, resolution |
|
||||||
| created | created |
|
| created | created |
|
||||||
|
|
|
@ -1710,6 +1710,7 @@ return [
|
||||||
"cid" => ["cid"],
|
"cid" => ["cid"],
|
||||||
"reporter-id" => ["reporter-id"],
|
"reporter-id" => ["reporter-id"],
|
||||||
"gsid" => ["gsid"],
|
"gsid" => ["gsid"],
|
||||||
|
"last-editor-uid" => ["last-editor-uid"],
|
||||||
"assigned-uid" => ["assigned-uid"],
|
"assigned-uid" => ["assigned-uid"],
|
||||||
"status-resolution" => ["status", "resolution"],
|
"status-resolution" => ["status", "resolution"],
|
||||||
"created" => ["created"],
|
"created" => ["created"],
|
||||||
|
|
|
@ -776,13 +776,15 @@
|
||||||
],
|
],
|
||||||
"query" => "FROM `post-user`
|
"query" => "FROM `post-user`
|
||||||
INNER JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid`
|
INNER JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid`
|
||||||
INNER JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
|
STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
|
||||||
|
STRAIGHT_JOIN `contact` AS `authorcontact` ON `authorcontact`.`id` = `post-thread-user`.`author-id`
|
||||||
|
STRAIGHT_JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
||||||
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
||||||
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
||||||
INNER JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
|
||||||
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
||||||
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
||||||
AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
|
AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
|
||||||
|
AND NOT `authorcontact`.`blocked` AND NOT `ownercontact`.`blocked`
|
||||||
AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
|
AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
|
||||||
AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`)"
|
AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`)"
|
||||||
],
|
],
|
||||||
|
@ -803,12 +805,14 @@
|
||||||
"query" => "FROM `post-thread-user`
|
"query" => "FROM `post-thread-user`
|
||||||
INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id`
|
INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id`
|
||||||
STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
|
STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
|
||||||
|
STRAIGHT_JOIN `contact` AS `authorcontact` ON `authorcontact`.`id` = `post-thread-user`.`author-id`
|
||||||
|
STRAIGHT_JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
||||||
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
||||||
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
||||||
LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
|
||||||
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
||||||
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
||||||
AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`)
|
AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`)
|
||||||
|
AND NOT `authorcontact`.`blocked` AND NOT `ownercontact`.`blocked`
|
||||||
AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
|
AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
|
||||||
AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`)"
|
AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`)"
|
||||||
],
|
],
|
||||||
|
|
Loading…
Reference in a new issue