XMPP URI and markdown are no friends (yet)

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index 601ed8e9591becaa60f18ec87da3f17801ca966c..c9017fd2ef81230d2a0c986219d6d49739f5f930 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2021.03-dev (Red Hot Poker)
--- DB_UPDATE_VERSION 1392
+-- DB_UPDATE_VERSION 1394
 -- ------------------------------------------
 
 
@@ -686,7 +686,6 @@ CREATE TABLE IF NOT EXISTS `item` (
        `owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the owner of this item',
        `author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the author of this item',
        `causer-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the contact that caused the item creation',
-       `icid` int unsigned COMMENT 'Id of the item-content table entry that contains the whole item content',
        `vid` smallint unsigned COMMENT 'Id of the verb table entry that contains the activity verbs',
        `extid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `post-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Post type (personal note, bookmark, ...)',
@@ -708,6 +707,7 @@ CREATE TABLE IF NOT EXISTS `item` (
        `resource-id` varchar(32) NOT NULL DEFAULT '' COMMENT 'Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type',
        `event-id` int unsigned COMMENT 'Used to link to the event.id',
        `iaid` int unsigned COMMENT 'Deprecated',
+       `icid` int unsigned COMMENT 'Deprecated',
        `attach` mediumtext COMMENT 'Deprecated',
        `allow_cid` mediumtext COMMENT 'Deprecated',
        `allow_gid` mediumtext COMMENT 'Deprecated',
@@ -765,8 +765,6 @@ CREATE TABLE IF NOT EXISTS `item` (
         INDEX `uid_unseen_wall` (`uid`,`unseen`,`wall`),
         INDEX `mention_uid_id` (`mention`,`uid`,`id`),
         INDEX `uid_eventid` (`uid`,`event-id`),
-        INDEX `icid` (`icid`),
-        INDEX `iaid` (`iaid`),
         INDEX `vid` (`vid`),
         INDEX `psid_wall` (`psid`,`wall`),
         INDEX `uri-id` (`uri-id`),
@@ -1496,11 +1494,9 @@ CREATE VIEW `post-view` AS SELECT
        `item`.`id` AS `id`,
        `item`.`id` AS `item_id`,
        `item`.`uid` AS `uid`,
-       `item`.`uid` AS `internal-uid`,
        `item`.`parent` AS `parent`,
        `item`.`uri` AS `uri`,
        `item`.`uri-id` AS `uri-id`,
-       `item`.`uri-id` AS `internal-uri-id`,
        `item`.`parent-uri` AS `parent-uri`,
        `item`.`parent-uri-id` AS `parent-uri-id`,
        `item`.`thr-parent` AS `thr-parent`,
@@ -1530,12 +1526,8 @@ CREATE VIEW `post-view` AS SELECT
        `item`.`mention` AS `mention`,
        `item`.`global` AS `global`,
        `item`.`network` AS `network`,
-       `item`.`icid` AS `icid`,
        `item`.`vid` AS `vid`,
        `item`.`psid` AS `psid`,
-       `item`.`attach` AS `attach`,
-       (SELECT COUNT(*) FROM `post-category` WHERE `post-category`.`uri-id` = `item`.`uri-id`) AS `internal-file-count`,
-       NULL AS `file`,
        IF (`item`.`vid` IS NULL, '', `verb`.`name`) AS `verb`,
        `item-content`.`title` AS `title`,
        `item-content`.`content-warning` AS `content-warning`,
@@ -1656,11 +1648,9 @@ CREATE VIEW `post-thread-view` AS SELECT
        `thread`.`iid` AS `iid`,
        `item`.`id` AS `item_id`,
        `thread`.`uid` AS `uid`,
-       `item`.`uid` AS `internal-uid`,
        `item`.`parent` AS `parent`,
        `item`.`uri` AS `uri`,
        `item`.`uri-id` AS `uri-id`,
-       `item`.`uri-id` AS `internal-uri-id`,
        `item`.`parent-uri` AS `parent-uri`,
        `item`.`parent-uri-id` AS `parent-uri-id`,
        `item`.`thr-parent` AS `thr-parent`,
@@ -1691,12 +1681,8 @@ CREATE VIEW `post-thread-view` AS SELECT
        `thread`.`mention` AS `mention`,
        `item`.`global` AS `global`,
        `thread`.`network` AS `network`,
-       `item`.`icid` AS `icid`,
        `item`.`vid` AS `vid`,
        `item`.`psid` AS `psid`,
-       `item`.`attach` AS `attach`,
-       (SELECT COUNT(*) FROM `post-category` WHERE `post-category`.`uri-id` = `item`.`uri-id`) AS `internal-file-count`,
-       NULL AS `file`,
        IF (`item`.`vid` IS NULL, '', `verb`.`name`) AS `verb`,
        `item-content`.`title` AS `title`,
        `item-content`.`content-warning` AS `content-warning`,