From: Michael <heluecht@pirati.ca>
Date: Thu, 28 May 2020 21:44:55 +0000 (+0000)
Subject: Add "uri-id" to the "thread" table
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3258216e8d0b012645f56ff0d21e5f3b9e250e28;p=friendica.git

Add "uri-id" to the "thread" table
---

diff --git a/src/Model/Item.php b/src/Model/Item.php
index a6036e6bdb..f014ed096e 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -3110,7 +3110,7 @@ class Item
 	private static function addThread($itemid, $onlyshadow = false)
 	{
 		$fields = ['uid', 'created', 'edited', 'commented', 'received', 'changed', 'wall', 'private', 'pubmail',
-			'moderated', 'visible', 'starred', 'contact-id', 'post-type',
+			'moderated', 'visible', 'starred', 'contact-id', 'post-type', 'uri-id',
 			'deleted', 'origin', 'forum_mode', 'mention', 'network', 'author-id', 'owner-id'];
 		$condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
 		$item = self::selectFirst($fields, $condition);
@@ -3131,7 +3131,7 @@ class Item
 	private static function updateThread($itemid, $setmention = false)
 	{
 		$fields = ['uid', 'guid', 'created', 'edited', 'commented', 'received', 'changed', 'post-type',
-			'wall', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'contact-id',
+			'wall', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'contact-id', 'uri-id',
 			'deleted', 'origin', 'forum_mode', 'network', 'author-id', 'owner-id'];
 		$condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
 
diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index fc7abded50..9fccdf14b6 100755
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -54,7 +54,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-	define('DB_UPDATE_VERSION', 1350);
+	define('DB_UPDATE_VERSION', 1351);
 }
 
 return [
@@ -1343,6 +1343,7 @@ return [
 		"fields" => [
 			"iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["item" => "id"],
 				"comment" => "sequential ID"],
+			"uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
 			"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
 			"contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
 			"owner-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "Item owner"],
@@ -1381,6 +1382,7 @@ return [
 			"uid_commented" => ["uid", "commented"],
 			"uid_wall_received" => ["uid", "wall", "received"],
 			"private_wall_origin_commented" => ["private", "wall", "origin", "commented"],
+			"uri-id" => ["uri-id"],
 		]
 	],
 	"tokens" => [
diff --git a/update.php b/update.php
index 48d44813b1..acbb458f7f 100644
--- a/update.php
+++ b/update.php
@@ -498,4 +498,13 @@ function update_1349()
 	}
 
 	return Update::SUCCESS;
-}
\ No newline at end of file
+}
+
+function update_1351()
+{
+	if (!DBA::e("UPDATE `thread` INNER JOIN `item` ON `thread`.`iid` = `item`.`id` SET `thread`.`uri-id` = `item`.`uri-id`")) {
+		return Update::FAILED;
+	}
+
+	return Update::SUCCESS;
+}