Merge pull request #11244 from MrPetovan/bug/11232-post-media-order

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index 4179932ad8d767ae859db57dd5573d8dcdcdcc5c..ea129109dc366f0672b137081a06f5aa979990f3 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
--- Friendica 2021.12-rc (Siberian Iris)
--- DB_UPDATE_VERSION 1448
+-- Friendica 2022.05-dev (Siberian Iris)
+-- DB_UPDATE_VERSION 1451
 -- ------------------------------------------
 
 
@@ -16,6 +16,11 @@ CREATE TABLE IF NOT EXISTS `gserver` (
        `info` text COMMENT '',
        `register_policy` tinyint NOT NULL DEFAULT 0 COMMENT '',
        `registered-users` int unsigned NOT NULL DEFAULT 0 COMMENT 'Number of registered users',
+       `active-week-users` int unsigned COMMENT 'Number of active users in the last week',
+       `active-month-users` int unsigned COMMENT 'Number of active users in the last month',
+       `active-halfyear-users` int unsigned COMMENT 'Number of active users in the last six month',
+       `local-posts` int unsigned COMMENT 'Number of local posts',
+       `local-comments` int unsigned COMMENT 'Number of local comments',
        `directory-type` tinyint DEFAULT 0 COMMENT 'Type of directory service (Poco, Mastodon)',
        `poco` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `noscrape` varchar(255) NOT NULL DEFAULT '' COMMENT '',
@@ -639,10 +644,13 @@ CREATE TABLE IF NOT EXISTS `group` (
        `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
        `visible` boolean NOT NULL DEFAULT '0' COMMENT '1 indicates the member list is not private',
        `deleted` boolean NOT NULL DEFAULT '0' COMMENT '1 indicates the group has been deleted',
+       `cid` int unsigned COMMENT 'Contact id of forum. When this field is filled then the members are synced automatically.',
        `name` varchar(255) NOT NULL DEFAULT '' COMMENT 'human readable name of group',
         PRIMARY KEY(`id`),
         INDEX `uid` (`uid`),
-       FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
+        INDEX `cid` (`cid`),
+       FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
+       FOREIGN KEY (`cid`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy groups, group info';
 
 --
@@ -1614,7 +1622,7 @@ CREATE VIEW `post-user-view` AS SELECT
        `post-content`.`title` AS `title`,
        `post-content`.`content-warning` AS `content-warning`,
        `post-content`.`raw-body` AS `raw-body`,
-       `post-content`.`body` AS `body`,
+       IFNULL (`post-content`.`body`, '') AS `body`,
        `post-content`.`rendered-hash` AS `rendered-hash`,
        `post-content`.`rendered-html` AS `rendered-html`,
        `post-content`.`language` AS `language`,