Merge remote-tracking branch 'upstream/develop' into new-participation

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index a68f3d4e5a2398b865598350f5120cf8bfefcc84..6c4758c24976a69e98731919a96fded49c4c696d 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2020.06-dev (Red Hot Poker)
--- DB_UPDATE_VERSION 1341
+-- DB_UPDATE_VERSION 1343
 -- ------------------------------------------
 
 
@@ -666,7 +666,8 @@ CREATE TABLE IF NOT EXISTS `item` (
         INDEX `uid_eventid` (`uid`,`event-id`),
         INDEX `icid` (`icid`),
         INDEX `iaid` (`iaid`),
-        INDEX `psid_wall` (`psid`,`wall`)
+        INDEX `psid_wall` (`psid`,`wall`),
+        INDEX `uri-id` (`uri-id`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Structure for all posts';
 
 --
@@ -1539,22 +1540,6 @@ CREATE VIEW `owner-view` AS SELECT
                        INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
                        INNER JOIN `profile` ON `profile`.`uid` = `user`.`uid`;
 
---
--- VIEW participation-view
---
-DROP VIEW IF EXISTS `participation-view`;
-CREATE VIEW `participation-view` AS SELECT 
-       `participation`.`iid` AS `iid`,
-       `contact`.`id` AS `id`,
-       `contact`.`url` AS `url`,
-       `contact`.`name` AS `name`,
-       `contact`.`protocol` AS `protocol`,
-       CASE `contact`.`batch` WHEN '' THEN `fcontact`.`batch` ELSE `contact`.`batch` END AS `batch`,
-       CASE `fcontact`.`network` WHEN '' THEN `contact`.`network` ELSE `fcontact`.`network` END AS `network`
-       FROM `participation`
-                       INNER JOIN `contact` ON `contact`.`id` = `participation`.`cid` AND NOT `contact`.`archive`
-                       INNER JOIN `fcontact` ON `fcontact`.`id` = `participation`.`fid`;
-
 --
 -- VIEW pending-view
 --
@@ -1577,6 +1562,27 @@ CREATE VIEW `pending-view` AS SELECT
                        INNER JOIN `contact` ON `register`.`uid` = `contact`.`uid`
                        INNER JOIN `user` ON `register`.`uid` = `user`.`uid`;
 
+--
+-- VIEW tag-search-view
+--
+DROP VIEW IF EXISTS `tag-search-view`;
+CREATE VIEW `tag-search-view` AS SELECT 
+       `post-tag`.`uri-id` AS `uri-id`,
+       `item`.`id` AS `iid`,
+       `item`.`uri` AS `uri`,
+       `item`.`guid` AS `guid`,
+       `item`.`uid` AS `uid`,
+       `item`.`private` AS `private`,
+       `item`.`wall` AS `wall`,
+       `item`.`origin` AS `origin`,
+       `item`.`gravity` AS `gravity`,
+       `item`.`received` AS `received`,
+       `tag`.`name` AS `name`
+       FROM `post-tag`
+                       INNER JOIN `tag` ON `tag`.`id` = `post-tag`.`tid`
+                       INNER JOIN `item` ON `item`.`uri-id` = `post-tag`.`uri-id`
+                       WHERE `post-tag`.`type` = 1;
+
 --
 -- VIEW workerqueue-view
 --