Merge remote-tracking branch 'refs/remotes/origin/develop' into Issue-#2816-2

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index ecd2be1529f4e29b963f1fb47355a9d07738b08b..c880e70bf4c500973ea2a8a408dcafae257e4f18 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 3.5.1-dev (Asparagus)
--- DB_UPDATE_VERSION 1203
+-- DB_UPDATE_VERSION 1204
 -- ------------------------------------------
 
 
@@ -58,7 +58,7 @@ CREATE TABLE IF NOT EXISTS `cache` (
        `v` text,
        `expire_mode` int(11) NOT NULL DEFAULT 0,
        `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY(`k`),
+        PRIMARY KEY(`k`(191)),
         INDEX `updated` (`updated`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -97,7 +97,7 @@ CREATE TABLE IF NOT EXISTS `config` (
        `k` varchar(255) NOT NULL DEFAULT '',
        `v` text,
         PRIMARY KEY(`id`),
-        INDEX `cat_k` (`cat`(30),`k`(30))
+        UNIQUE INDEX `cat_k` (`cat`(30),`k`(30))
 ) DEFAULT CHARSET=utf8mb4;
 
 --
@@ -328,6 +328,7 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
        `gender` varchar(32) NOT NULL DEFAULT '',
        `birthday` varchar(32) NOT NULL DEFAULT '0000-00-00',
        `community` tinyint(1) NOT NULL DEFAULT 0,
+       `contact-type` tinyint(1) NOT NULL DEFAULT -1,
        `hide` tinyint(1) NOT NULL DEFAULT 0,
        `nsfw` tinyint(1) NOT NULL DEFAULT 0,
        `network` varchar(255) NOT NULL DEFAULT '',
@@ -679,7 +680,7 @@ CREATE TABLE IF NOT EXISTS `oembed` (
        `url` varchar(255) NOT NULL,
        `content` text,
        `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY(`url`),
+        PRIMARY KEY(`url`(191)),
         INDEX `created` (`created`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -692,7 +693,7 @@ CREATE TABLE IF NOT EXISTS `parsed_url` (
        `oembed` tinyint(1) NOT NULL DEFAULT 0,
        `content` text,
        `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY(`url`,`guessing`,`oembed`),
+        PRIMARY KEY(`url`(191),`guessing`,`oembed`),
         INDEX `created` (`created`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -706,7 +707,7 @@ CREATE TABLE IF NOT EXISTS `pconfig` (
        `k` varchar(255) NOT NULL DEFAULT '',
        `v` mediumtext,
         PRIMARY KEY(`id`),
-        INDEX `uid_cat_k` (`uid`,`cat`(30),`k`(30))
+        UNIQUE INDEX `uid_cat_k` (`uid`,`cat`(30),`k`(30))
 ) DEFAULT CHARSET=utf8mb4;
 
 --