Merge remote-tracking branch 'upstream/develop' into 1604-cookie

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index 70b315ea244f0be305b8647be65e3e1f4fee2c73..07fb65b96d9ebf59e68fa119e926d062c6605b13 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 3.5-dev (Asparagus)
--- DB_UPDATE_VERSION 1193
+-- 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
 --
@@ -344,6 +335,9 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
        `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;
 
@@ -411,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
 --
@@ -926,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;
 
 --