Test: Another test for the test

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index fdcc1ffe1476af6631f27e00107269065d64a2b3..8d0d3594c969d50af2812a2df7121eabd88b2405 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1559,6 +1559,10 @@ CREATE VIEW `post-view` AS SELECT
        `contact`.`nick` AS `contact-nick`,
        `contact`.`thumb` AS `contact-avatar`,
        `contact`.`network` AS `contact-network`,
+       `contact`.`blocked` AS `contact-blocked`,
+       `contact`.`readonly` AS `contact-readonly`,
+       `contact`.`pending` AS `contact-pending`,
+       `contact`.`rel` AS `contact-rel`,
        `contact`.`uid` AS `contact-uid`,
        IF (`item`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`) AS `writable`,
        `contact`.`self` AS `self`,
@@ -1577,6 +1581,7 @@ CREATE VIEW `post-view` AS SELECT
        `author`.`nick` AS `author-nick`,
        IF (`contact`.`url` = `author`.`url`, `contact`.`thumb`, `author`.`thumb`) AS `author-avatar`,
        `author`.`network` AS `author-network`,
+       `author`.`blocked` AS `author-blocked`,
        `item`.`owner-id` AS `owner-id`,
        `owner`.`url` AS `owner-link`,
        `owner`.`addr` AS `owner-addr`,
@@ -1584,6 +1589,7 @@ CREATE VIEW `post-view` AS SELECT
        `owner`.`nick` AS `owner-nick`,
        IF (`contact`.`url` = `owner`.`url`, `contact`.`thumb`, `owner`.`thumb`) AS `owner-avatar`,
        `owner`.`network` AS `owner-network`,
+       `owner`.`blocked` AS `owner-blocked`,
        `item`.`causer-id` AS `causer-id`,
        `causer`.`url` AS `causer-link`,
        `causer`.`addr` AS `causer-addr`,
@@ -1591,6 +1597,7 @@ CREATE VIEW `post-view` AS SELECT
        `causer`.`nick` AS `causer-nick`,
        `causer`.`thumb` AS `causer-avatar`,
        `causer`.`network` AS `causer-network`,
+       `causer`.`blocked` AS `causer-blocked`,
        `causer`.`contact-type` AS `causer-contact-type`,
        `post-delivery-data`.`postopts` AS `postopts`,
        `post-delivery-data`.`inform` AS `inform`,
@@ -1601,10 +1608,6 @@ CREATE VIEW `post-view` AS SELECT
        IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_gid`) AS `allow_gid`,
        IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_cid`) AS `deny_cid`,
        IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_gid`) AS `deny_gid`,
-       `user-item`.`pinned` AS `pinned`,
-       `user-item`.`hidden` AS `hidden`,
-       `user-item`.`ignored` AS `ignored`,
-       `user-item`.`notification-type` AS `notification-type`,
        `item`.`event-id` AS `event-id`,
        `event`.`created` AS `event-created`,
        `event`.`edited` AS `event-edited`,
@@ -1625,19 +1628,18 @@ CREATE VIEW `post-view` AS SELECT
        `parent-item-author`.`name` AS `parent-author-name`,
        `parent-item-author`.`network` AS `parent-author-network`
        FROM `item`
-                       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 `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`
                        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 `user-item` ON `user-item`.`iid` = `item`.`id`
-                       STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`
-                       STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`;
+                       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`;
 
 --
 -- VIEW category-view