Improve the test data

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index 8d0d3594c969d50af2812a2df7121eabd88b2405..985a6421108f9bd10e51cbe64724c0584c4704ee 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2021.03-dev (Red Hot Poker)
--- DB_UPDATE_VERSION 1386
+-- DB_UPDATE_VERSION 1389
 -- ------------------------------------------
 
 
@@ -1560,10 +1560,13 @@ CREATE VIEW `post-view` AS SELECT
        `contact`.`thumb` AS `contact-avatar`,
        `contact`.`network` AS `contact-network`,
        `contact`.`blocked` AS `contact-blocked`,
+       `contact`.`hidden` AS `contact-hidden`,
        `contact`.`readonly` AS `contact-readonly`,
+       `contact`.`archive` AS `contact-archive`,
        `contact`.`pending` AS `contact-pending`,
        `contact`.`rel` AS `contact-rel`,
        `contact`.`uid` AS `contact-uid`,
+       `contact`.`contact-type` AS `contact-contact-type`,
        IF (`item`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`) AS `writable`,
        `contact`.`self` AS `self`,
        `contact`.`id` AS `cid`,
@@ -1574,6 +1577,7 @@ CREATE VIEW `post-view` AS SELECT
        `contact`.`avatar-date` AS `avatar-date`,
        `contact`.`thumb` AS `thumb`,
        `contact`.`dfrn-id` AS `dfrn-id`,
+       `group_member`.`gid` AS `group-id`,
        `item`.`author-id` AS `author-id`,
        `author`.`url` AS `author-link`,
        `author`.`addr` AS `author-addr`,
@@ -1582,6 +1586,7 @@ CREATE VIEW `post-view` AS SELECT
        IF (`contact`.`url` = `author`.`url`, `contact`.`thumb`, `author`.`thumb`) AS `author-avatar`,
        `author`.`network` AS `author-network`,
        `author`.`blocked` AS `author-blocked`,
+       `author`.`hidden` AS `author-hidden`,
        `item`.`owner-id` AS `owner-id`,
        `owner`.`url` AS `owner-link`,
        `owner`.`addr` AS `owner-addr`,
@@ -1590,6 +1595,7 @@ CREATE VIEW `post-view` AS SELECT
        IF (`contact`.`url` = `owner`.`url`, `contact`.`thumb`, `owner`.`thumb`) AS `owner-avatar`,
        `owner`.`network` AS `owner-network`,
        `owner`.`blocked` AS `owner-blocked`,
+       `owner`.`hidden` AS `owner-hidden`,
        `item`.`causer-id` AS `causer-id`,
        `causer`.`url` AS `causer-link`,
        `causer`.`addr` AS `causer-addr`,
@@ -1598,6 +1604,7 @@ CREATE VIEW `post-view` AS SELECT
        `causer`.`thumb` AS `causer-avatar`,
        `causer`.`network` AS `causer-network`,
        `causer`.`blocked` AS `causer-blocked`,
+       `causer`.`hidden` AS `causer-hidden`,
        `causer`.`contact-type` AS `causer-contact-type`,
        `post-delivery-data`.`postopts` AS `postopts`,
        `post-delivery-data`.`inform` AS `inform`,
@@ -1628,18 +1635,19 @@ CREATE VIEW `post-view` AS SELECT
        `parent-item-author`.`name` AS `parent-author-name`,
        `parent-item-author`.`network` AS `parent-author-network`
        FROM `item`
-                       LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-                       LEFT JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
-                       LEFT JOIN `contact` AS `owner` ON `owner`.`id` = `item`.`owner-id`
-                       LEFT JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id`
+                       STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+                       STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
+                       STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `item`.`owner-id`
+                       STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id`
+                       LEFT JOIN `group_member` ON `group_member`.`contact-id` = `item`.`contact-id`
                        LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid`
                        LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
                        LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`
                        LEFT JOIN `item-content` ON `item-content`.`uri-id` = `item`.`uri-id`
                        LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `item`.`uri-id` AND `item`.`origin`
                        LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`
-                       LEFT JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`
-                       LEFT JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`;
+                       STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`uri-id` = `item`.`parent-uri-id`
+                       STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`;
 
 --
 -- VIEW category-view