frio: Bugfix for linebreak of locations in comments

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index 1277585c9dbc932fe3d162faf7d7b87ac381406f..07fb65b96d9ebf59e68fa119e926d062c6605b13 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 3.5-dev (Asparagus)
--- DB_UPDATE_VERSION 1192
+-- DB_UPDATE_VERSION 1195
 -- ------------------------------------------
 
 
@@ -119,6 +119,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
        `keywords` text NOT NULL,
        `gender` varchar(32) NOT NULL DEFAULT '',
        `attag` varchar(255) NOT NULL DEFAULT '',
+       `avatar` varchar(255) NOT NULL DEFAULT '',
        `photo` text NOT NULL,
        `thumb` text NOT NULL,
        `micro` text NOT NULL,
@@ -170,7 +171,8 @@ CREATE TABLE IF NOT EXISTS `contact` (
        `fetch_further_information` tinyint(1) NOT NULL DEFAULT 0,
        `ffi_keyword_blacklist` mediumtext NOT NULL,
         PRIMARY KEY(`id`),
-        INDEX `uid` (`uid`)
+        INDEX `uid` (`uid`),
+        INDEX `nurl` (`nurl`)
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -200,17 +202,6 @@ CREATE TABLE IF NOT EXISTS `deliverq` (
         PRIMARY KEY(`id`)
 ) DEFAULT CHARSET=utf8;
 
---
--- TABLE dsprphotoq
---
-CREATE TABLE IF NOT EXISTS `dsprphotoq` (
-       `id` int(10) unsigned NOT NULL auto_increment,
-       `uid` int(11) NOT NULL DEFAULT 0,
-       `msg` mediumtext NOT NULL,
-       `attempt` tinyint(4) NOT NULL DEFAULT 0,
-        PRIMARY KEY(`id`)
-) DEFAULT CHARSET=utf8;
-
 --
 -- TABLE event
 --
@@ -332,13 +323,21 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
        `about` text NOT NULL,
        `keywords` text NOT NULL,
        `gender` varchar(32) NOT NULL DEFAULT '',
+       `birthday` varchar(32) NOT NULL DEFAULT '0000-00-00',
        `community` tinyint(1) NOT NULL DEFAULT 0,
+       `hide` tinyint(1) NOT NULL DEFAULT 0,
+       `nsfw` tinyint(1) NOT NULL DEFAULT 0,
        `network` varchar(255) NOT NULL DEFAULT '',
        `addr` varchar(255) NOT NULL DEFAULT '',
+       `notify` text NOT NULL,
+       `alias` varchar(255) NOT NULL DEFAULT '',
        `generation` tinyint(3) NOT NULL DEFAULT 0,
        `server_url` varchar(255) NOT NULL DEFAULT '',
         PRIMARY KEY(`id`),
         INDEX `nurl` (`nurl`),
+        INDEX `name` (`name`),
+        INDEX `nick` (`nick`),
+        INDEX `addr` (`addr`),
         INDEX `updated` (`updated`)
 ) DEFAULT CHARSET=utf8;
 
@@ -406,21 +405,6 @@ CREATE TABLE IF NOT EXISTS `gserver` (
         INDEX `nurl` (`nurl`)
 ) DEFAULT CHARSET=utf8;
 
---
--- TABLE guid
---
-CREATE TABLE IF NOT EXISTS `guid` (
-       `id` int(10) unsigned NOT NULL auto_increment,
-       `guid` varchar(255) NOT NULL DEFAULT '',
-       `plink` varchar(255) NOT NULL DEFAULT '',
-       `uri` varchar(255) NOT NULL DEFAULT '',
-       `network` varchar(32) NOT NULL DEFAULT '',
-        PRIMARY KEY(`id`),
-        INDEX `guid` (`guid`),
-        INDEX `plink` (`plink`),
-        INDEX `uri` (`uri`)
-) DEFAULT CHARSET=utf8;
-
 --
 -- TABLE hook
 --
@@ -536,6 +520,7 @@ CREATE TABLE IF NOT EXISTS `item` (
         INDEX `uid_thrparent` (`uid`,`thr-parent`),
         INDEX `uid_parenturi` (`uid`,`parent-uri`),
         INDEX `uid_contactid_created` (`uid`,`contact-id`,`created`),
+        INDEX `gcontactid_uid_created` (`gcontact-id`,`uid`,`created`),
         INDEX `wall_body` (`wall`,`body`(6)),
         INDEX `uid_visible_moderated_created` (`uid`,`visible`,`moderated`,`created`),
         INDEX `uid_uri` (`uid`,`uri`),
@@ -679,6 +664,30 @@ CREATE TABLE IF NOT EXISTS `notify-threads` (
         INDEX `receiver-uid` (`receiver-uid`)
 ) DEFAULT CHARSET=utf8;
 
+--
+-- TABLE oembed
+--
+CREATE TABLE IF NOT EXISTS `oembed` (
+       `url` varchar(255) NOT NULL,
+       `content` text NOT NULL,
+       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+        PRIMARY KEY(`url`),
+        INDEX `created` (`created`)
+) DEFAULT CHARSET=utf8;
+
+--
+-- TABLE parsed_url
+--
+CREATE TABLE IF NOT EXISTS `parsed_url` (
+       `url` varchar(255) NOT NULL,
+       `guessing` tinyint(1) NOT NULL DEFAULT 0,
+       `oembed` tinyint(1) NOT NULL DEFAULT 0,
+       `content` text NOT NULL,
+       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+        PRIMARY KEY(`url`,`guessing`,`oembed`),
+        INDEX `created` (`created`)
+) DEFAULT CHARSET=utf8;
+
 --
 -- TABLE pconfig
 --
@@ -896,13 +905,11 @@ CREATE TABLE IF NOT EXISTS `session` (
 CREATE TABLE IF NOT EXISTS `sign` (
        `id` int(10) unsigned NOT NULL auto_increment,
        `iid` int(10) unsigned NOT NULL DEFAULT 0,
-       `retract_iid` int(10) unsigned NOT NULL DEFAULT 0,
        `signed_text` mediumtext NOT NULL,
        `signature` text NOT NULL,
        `signer` varchar(255) NOT NULL DEFAULT '',
         PRIMARY KEY(`id`),
-        INDEX `iid` (`iid`),
-        INDEX `retract_iid` (`retract_iid`)
+        INDEX `iid` (`iid`)
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -982,6 +989,8 @@ CREATE TABLE IF NOT EXISTS `thread` (
         INDEX `uid_network_created` (`uid`,`network`,`created`),
         INDEX `uid_contactid_commented` (`uid`,`contact-id`,`commented`),
         INDEX `uid_contactid_created` (`uid`,`contact-id`,`created`),
+        INDEX `uid_gcontactid_commented` (`uid`,`gcontact-id`,`commented`),
+        INDEX `uid_gcontactid_created` (`uid`,`gcontact-id`,`created`),
         INDEX `wall_private_received` (`wall`,`private`,`received`),
         INDEX `uid_created` (`uid`,`created`),
         INDEX `uid_commented` (`uid`,`commented`)
@@ -1000,21 +1009,6 @@ CREATE TABLE IF NOT EXISTS `tokens` (
         PRIMARY KEY(`id`)
 ) DEFAULT CHARSET=utf8;
 
---
--- TABLE unique_contacts
---
-CREATE TABLE IF NOT EXISTS `unique_contacts` (
-       `id` int(11) NOT NULL auto_increment,
-       `url` varchar(255) NOT NULL DEFAULT '',
-       `nick` varchar(255) NOT NULL DEFAULT '',
-       `name` varchar(255) NOT NULL DEFAULT '',
-       `avatar` varchar(255) NOT NULL DEFAULT '',
-       `location` varchar(255) NOT NULL DEFAULT '',
-       `about` text NOT NULL,
-        PRIMARY KEY(`id`),
-        INDEX `url` (`url`)
-) DEFAULT CHARSET=utf8;
-
 --
 -- TABLE user
 --