X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=database.sql;h=d1c73cc048f3f606932d629760f3f8145188cd47;hb=903d829f4988592c102495eab82d523d7d093300;hp=933502ef8ed362e8626655961536fb93a7c94abd;hpb=235eab0d99891eb1d0bf401856dfb162c6f1ea20;p=friendica.git

diff --git a/database.sql b/database.sql
index 933502ef8e..d1c73cc048 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
--- Friendica 2021.12-dev (Siberian Iris)
--- DB_UPDATE_VERSION 1440
+-- Friendica 2021.12-rc (Siberian Iris)
+-- DB_UPDATE_VERSION 1446
 -- ------------------------------------------
 
 
@@ -681,16 +681,6 @@ CREATE TABLE IF NOT EXISTS `hook` (
 	 UNIQUE INDEX `hook_file_function` (`hook`,`file`,`function`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='addon hook registry';
 
---
--- TABLE host
---
-CREATE TABLE IF NOT EXISTS `host` (
-	`id` tinyint unsigned NOT NULL auto_increment COMMENT 'sequential ID',
-	`name` varchar(128) NOT NULL DEFAULT '' COMMENT 'The hostname',
-	 PRIMARY KEY(`id`),
-	 UNIQUE INDEX `name` (`name`)
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Hostname';
-
 --
 -- TABLE inbox-status
 --
@@ -715,14 +705,15 @@ CREATE TABLE IF NOT EXISTS `intro` (
 	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`suggest-cid` int unsigned COMMENT 'Suggested contact',
 	`knowyou` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`duplex` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`duplex` boolean NOT NULL DEFAULT '0' COMMENT 'deprecated',
 	`note` text COMMENT '',
 	`hash` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`datetime` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`blocked` boolean NOT NULL DEFAULT '1' COMMENT '',
+	`blocked` boolean NOT NULL DEFAULT '0' COMMENT 'deprecated',
 	`ignore` boolean NOT NULL DEFAULT '0' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `contact-id` (`contact-id`),
+	 INDEX `suggest-cid` (`suggest-cid`),
 	 INDEX `uid` (`uid`),
 	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
 	FOREIGN KEY (`contact-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
@@ -1324,10 +1315,11 @@ CREATE TABLE IF NOT EXISTS `post-user-notification` (
 -- TABLE process
 --
 CREATE TABLE IF NOT EXISTS `process` (
-	`pid` int unsigned NOT NULL COMMENT '',
+	`pid` int unsigned NOT NULL COMMENT 'The ID of the process',
+	`hostname` varchar(32) NOT NULL COMMENT 'The name of the host the process is ran on',
 	`command` varbinary(32) NOT NULL DEFAULT '' COMMENT '',
 	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	 PRIMARY KEY(`pid`),
+	 PRIMARY KEY(`pid`,`hostname`),
 	 INDEX `command` (`command`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Currently running system processes';
 
@@ -1519,6 +1511,7 @@ CREATE TABLE IF NOT EXISTS `user-contact` (
 	`blocked` boolean COMMENT 'Contact is completely blocked for this user',
 	`ignored` boolean COMMENT 'Posts from this contact are ignored',
 	`collapsed` boolean COMMENT 'Posts from this contact are collapsed',
+	`hidden` boolean COMMENT 'This contact is hidden from the others',
 	`pending` boolean COMMENT '',
 	`rel` tinyint unsigned COMMENT 'The kind of the relation between the user and the contact',
 	`info` mediumtext COMMENT '',
@@ -1709,6 +1702,7 @@ CREATE VIEW `post-user-view` AS SELECT
 	`parent-post`.`author-id` AS `parent-author-id`,
 	`parent-post-author`.`url` AS `parent-author-link`,
 	`parent-post-author`.`name` AS `parent-author-name`,
+	`parent-post-author`.`nick` AS `parent-author-nick`,
 	`parent-post-author`.`network` AS `parent-author-network`,
 	`parent-post-author`.`blocked` AS `parent-author-blocked`,
 	`parent-post-author`.`hidden` AS `parent-author-hidden`
@@ -2592,18 +2586,18 @@ CREATE VIEW `workerqueue-view` AS SELECT
 -- VIEW profile_field-view
 --
 DROP VIEW IF EXISTS `profile_field-view`;
-CREATE VIEW `profile_field-view` AS SELECT
-	  `profile_field`.`id` AS `id`,
-	  `profile_field`.`uid` AS `uid`,
-	  `profile_field`.`label` AS `label`,
-	  `profile_field`.`value` AS `value`,
-	  `profile_field`.`order` AS `order`,
-	  `profile_field`.`psid` AS `psid`,
-	  `permissionset`.`allow_cid` AS `allow_cid`,
-	  `permissionset`.`allow_gid` AS `allow_gid`,
-	  `permissionset`.`deny_cid` AS `deny_cid`,
-	  `permissionset`.`deny_gid` AS `deny_gid`,
-	  `profile_field`.`created` AS `created`,
-	  `profile_field`.`edited` AS `edited`
-  FROM `profile_field`
-		   INNER JOIN `permissionset` ON `permissionset`.`id` = `profile_field`.`psid`;
+CREATE VIEW `profile_field-view` AS SELECT 
+	`profile_field`.`id` AS `id`,
+	`profile_field`.`uid` AS `uid`,
+	`profile_field`.`label` AS `label`,
+	`profile_field`.`value` AS `value`,
+	`profile_field`.`order` AS `order`,
+	`profile_field`.`psid` AS `psid`,
+	`permissionset`.`allow_cid` AS `allow_cid`,
+	`permissionset`.`allow_gid` AS `allow_gid`,
+	`permissionset`.`deny_cid` AS `deny_cid`,
+	`permissionset`.`deny_gid` AS `deny_gid`,
+	`profile_field`.`created` AS `created`,
+	`profile_field`.`edited` AS `edited`
+	FROM `profile_field`
+			INNER JOIN `permissionset` ON `permissionset`.`id` = `profile_field`.`psid`;