From 6fa7c23bb93a7b665b56627bfdff8ed647392b87 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 24 Aug 2023 07:48:35 -0400 Subject: [PATCH] [Database 1529] Add author baseurl to post-user-view - Explicit the contact.baseurl and contact.gsid caveat --- database.sql | 7 ++++--- doc/database/db_contact.md | 4 ++-- static/dbstructure.config.php | 6 +++--- static/dbview.config.php | 1 + 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/database.sql b/database.sql index 89a80b170b..bc73b5ac08 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ -- Friendica 2023.09-dev (Giant Rhubarb) --- DB_UPDATE_VERSION 1528 +-- DB_UPDATE_VERSION 1529 -- ------------------------------------------ @@ -173,8 +173,8 @@ CREATE TABLE IF NOT EXISTS `contact` ( `archive` boolean NOT NULL DEFAULT '0' COMMENT '', `unsearchable` boolean NOT NULL DEFAULT '0' COMMENT 'Contact prefers to not be searchable', `sensitive` boolean NOT NULL DEFAULT '0' COMMENT 'Contact posts sensitive content', - `baseurl` varbinary(383) DEFAULT '' COMMENT 'baseurl of the contact', - `gsid` int unsigned COMMENT 'Global Server ID', + `baseurl` varbinary(383) DEFAULT '' COMMENT 'baseurl of the contact from the gserver record, can be missing', + `gsid` int unsigned COMMENT 'Global Server ID, can be missing', `bd` date NOT NULL DEFAULT '0001-01-01' COMMENT '', `reason` text COMMENT '', `self` boolean NOT NULL DEFAULT '0' COMMENT '1 if the contact is the user him/her self', @@ -2045,6 +2045,7 @@ CREATE VIEW `post-user-view` AS SELECT `author`.`hidden` AS `author-hidden`, `author`.`updated` AS `author-updated`, `author`.`gsid` AS `author-gsid`, + `author`.`baseurl` AS `author-baseurl`, `post-user`.`owner-id` AS `owner-id`, `owner`.`uri-id` AS `owner-uri-id`, `owner`.`url` AS `owner-link`, diff --git a/doc/database/db_contact.md b/doc/database/db_contact.md index 496210067a..8221f279e2 100644 --- a/doc/database/db_contact.md +++ b/doc/database/db_contact.md @@ -51,8 +51,8 @@ Fields | archive | | boolean | NO | | 0 | | | unsearchable | Contact prefers to not be searchable | boolean | NO | | 0 | | | sensitive | Contact posts sensitive content | boolean | NO | | 0 | | -| baseurl | baseurl of the contact | varbinary(383) | YES | | | | -| gsid | Global Server ID | int unsigned | YES | | NULL | | +| baseurl | baseurl of the contact from the gserver record, can be missing | varbinary(383) | YES | | | | +| gsid | Global Server ID, can be missing | int unsigned | YES | | NULL | | | bd | | date | NO | | 0001-01-01 | | | reason | | text | YES | | NULL | | | self | 1 if the contact is the user him/her self | boolean | NO | | 0 | | diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index cef6855364..71c7d5cb1d 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -56,7 +56,7 @@ use Friendica\Database\DBA; // This file is required several times during the test in DbaDefinition which justifies this condition if (!defined('DB_UPDATE_VERSION')) { - define('DB_UPDATE_VERSION', 1528); + define('DB_UPDATE_VERSION', 1529); } return [ @@ -230,8 +230,8 @@ return [ "archive" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""], "unsearchable" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Contact prefers to not be searchable"], "sensitive" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Contact posts sensitive content"], - "baseurl" => ["type" => "varbinary(383)", "default" => "", "comment" => "baseurl of the contact"], - "gsid" => ["type" => "int unsigned", "foreign" => ["gserver" => "id", "on delete" => "restrict"], "comment" => "Global Server ID"], + "baseurl" => ["type" => "varbinary(383)", "default" => "", "comment" => "baseurl of the contact from the gserver record, can be missing"], + "gsid" => ["type" => "int unsigned", "foreign" => ["gserver" => "id", "on delete" => "restrict"], "comment" => "Global Server ID, can be missing"], "bd" => ["type" => "date", "not null" => "1", "default" => DBA::NULL_DATE, "comment" => ""], // User depending fields "reason" => ["type" => "text", "comment" => ""], diff --git a/static/dbview.config.php b/static/dbview.config.php index 5da17a42e7..ed120e55e5 100644 --- a/static/dbview.config.php +++ b/static/dbview.config.php @@ -185,6 +185,7 @@ "author-hidden" => ["author", "hidden"], "author-updated" => ["author", "updated"], "author-gsid" => ["author", "gsid"], + "author-baseurl" => ["author", "baseurl"], "owner-id" => ["post-user", "owner-id"], "owner-uri-id" => ["owner", "uri-id"], "owner-link" => ["owner", "url"],