Merge pull request #8594 from annando/issue-8586

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index 320ef38e77177b2f0355a56f8c85ed7f4b1cdf2c..a26b6f2bfdec0fb8bf247dddde6a77a10c8ff6e6 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2020.06-dev (Red Hot Poker)
--- DB_UPDATE_VERSION 1343
+-- DB_UPDATE_VERSION 1346
 -- ------------------------------------------
 
 
@@ -815,6 +815,8 @@ CREATE TABLE IF NOT EXISTS `notify` (
        `link` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `iid` int unsigned NOT NULL DEFAULT 0 COMMENT 'item.id',
        `parent` int unsigned NOT NULL DEFAULT 0 COMMENT '',
+       `uri-id` int unsigned COMMENT 'Item-uri id of the related post',
+       `parent-uri-id` int unsigned COMMENT 'Item-uri id of the parent of the related post',
        `seen` boolean NOT NULL DEFAULT '0' COMMENT '',
        `verb` varchar(100) NOT NULL DEFAULT '' COMMENT '',
        `otype` varchar(10) NOT NULL DEFAULT '' COMMENT '',
@@ -833,6 +835,7 @@ CREATE TABLE IF NOT EXISTS `notify-threads` (
        `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
        `notify-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
        `master-parent-item` int unsigned NOT NULL DEFAULT 0 COMMENT '',
+       `master-parent-uri-id` int unsigned COMMENT 'Item-uri id of the parent of the related post',
        `parent-item` int unsigned NOT NULL DEFAULT 0 COMMENT '',
        `receiver-uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
         PRIMARY KEY(`id`)
@@ -1170,6 +1173,18 @@ CREATE TABLE IF NOT EXISTS `tag` (
         INDEX `url` (`url`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='tags and mentions';
 
+--
+-- TABLE post-category
+--
+CREATE TABLE IF NOT EXISTS `post-category` (
+       `uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
+       `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
+       `type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
+       `tid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
+        PRIMARY KEY(`uri-id`,`uid`,`type`,`tid`),
+        INDEX `uri-id` (`tid`)
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='post relation to categories';
+
 --
 -- TABLE post-delivery-data
 --
@@ -1387,6 +1402,23 @@ CREATE TABLE IF NOT EXISTS `storage` (
         PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Data stored by Database storage backend';
 
+--
+-- VIEW category-view
+--
+DROP VIEW IF EXISTS `category-view`;
+CREATE VIEW `category-view` AS SELECT 
+       `post-category`.`uri-id` AS `uri-id`,
+       `post-category`.`uid` AS `uid`,
+       `item-uri`.`uri` AS `uri`,
+       `item-uri`.`guid` AS `guid`,
+       `post-category`.`type` AS `type`,
+       `post-category`.`tid` AS `tid`,
+       `tag`.`name` AS `name`,
+       `tag`.`url` AS `url`
+       FROM `post-category`
+                       INNER JOIN `item-uri` ON `item-uri`.id = `post-category`.`uri-id`
+                       LEFT JOIN `tag` ON `post-category`.`tid` = `tag`.`id`;
+
 --
 -- VIEW tag-view
 --
@@ -1540,22 +1572,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
 --