X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=database.sql;h=5387d14c6ca9c260fe8c90d96e4549fd8906d7e3;hb=c4446e200f5729fdd2d920a962bb0cdcb2d2eb6c;hp=3236870f3750fd1ef97d045c6c77b5d69b232a1a;hpb=24b5396b1d1e0c63b6dcc4d6d0ab7b73fb9d4cd8;p=friendica.git

diff --git a/database.sql b/database.sql
index 3236870f37..5387d14c6c 100644
--- a/database.sql
+++ b/database.sql
@@ -1388,35 +1388,6 @@ CREATE VIEW `tag-view` AS SELECT
 			LEFT JOIN `tag` ON `post-tag`.`tid` = `tag`.`id`
 			LEFT JOIN `contact` ON `post-tag`.`cid` = `contact`.`id`;
 
---
--- VIEW network-thread-view
---
-DROP VIEW IF EXISTS `network-thread-view`;
-CREATE VIEW `network-thread-view` AS SELECT 
-	`item`.`uri-id` AS `uri-id`,
-	`item`.`uri` AS `uri`,
-	`item`.`parent-uri-id` AS `parent-uri-id`,
-	`thread`.`iid` AS `parent`,
-	`thread`.`iid` AS `item_id`,
-	`thread`.`received` AS `received`,
-	`thread`.`commented` AS `commented`,
-	`thread`.`created` AS `created`,
-	`thread`.`uid` AS `uid`,
-	`thread`.`starred` AS `starred`,
-	`thread`.`mention` AS `mention`,
-	`thread`.`network` AS `network`,
-	`thread`.`contact-id` AS `contact-id`
-	FROM `thread`
-			STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-			STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
-			LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = `thread`.`uid`
-			LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `thread`.`uid` AND `author`.`cid` = `thread`.`author-id`
-			LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `thread`.`uid` AND `owner`.`cid` = `thread`.`owner-id`
-			WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
-			AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`)
-			AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
-			AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`);
-
 --
 -- VIEW network-item-view
 --
@@ -1425,7 +1396,6 @@ CREATE VIEW `network-item-view` AS SELECT
 	`item`.`parent-uri-id` AS `uri-id`,
 	`item`.`parent-uri` AS `uri`,
 	`item`.`parent` AS `parent`,
-	`item`.`parent` AS `item_id`,
 	`item`.`received` AS `received`,
 	`item`.`commented` AS `commented`,
 	`item`.`created` AS `created`,
@@ -1447,6 +1417,34 @@ CREATE VIEW `network-item-view` AS SELECT
 			AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
 			AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`);
 
+--
+-- VIEW network-thread-view
+--
+DROP VIEW IF EXISTS `network-thread-view`;
+CREATE VIEW `network-thread-view` AS SELECT 
+	`item`.`uri-id` AS `uri-id`,
+	`item`.`uri` AS `uri`,
+	`item`.`parent-uri-id` AS `parent-uri-id`,
+	`thread`.`iid` AS `parent`,
+	`thread`.`received` AS `received`,
+	`thread`.`commented` AS `commented`,
+	`thread`.`created` AS `created`,
+	`thread`.`uid` AS `uid`,
+	`thread`.`starred` AS `starred`,
+	`thread`.`mention` AS `mention`,
+	`thread`.`network` AS `network`,
+	`thread`.`contact-id` AS `contact-id`
+	FROM `thread`
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`)
+			STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
+			LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = `thread`.`uid`
+			LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `thread`.`uid` AND `author`.`cid` = `thread`.`author-id`
+			LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `thread`.`uid` AND `owner`.`cid` = `thread`.`owner-id`
+			WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
+			AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`)
+			AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
+			AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`);
+
 --
 -- VIEW owner-view
 --