Updated version number

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index 606ac6d81452b1c8742eb2679801c0c88c7dfce0..59460b8059e85d50246e5f7134953c1cf2862f4c 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
--- Friendica 3.6-dev (Asparagus)
--- DB_UPDATE_VERSION 1254
+-- Friendica 2018-05-dev (The Tazmans Flax-lily)
+-- DB_UPDATE_VERSION 1256
 -- ------------------------------------------
 
 
@@ -55,12 +55,12 @@ CREATE TABLE IF NOT EXISTS `auth_codes` (
 -- TABLE cache
 --
 CREATE TABLE IF NOT EXISTS `cache` (
-       `k` varbinary(255) NOT NULL COMMENT '',
-       `v` mediumtext COMMENT '',
-       `expire_mode` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
-       `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+       `k` varbinary(255) NOT NULL COMMENT 'cache key',
+       `v` mediumtext COMMENT 'cached serialized value',
+       `expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of cache expiration',
+       `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of cache insertion',
         PRIMARY KEY(`k`),
-        INDEX `expire_mode_updated` (`expire_mode`,`updated`)
+        INDEX `k_expires` (`k`,`expires`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
 --
@@ -445,7 +445,6 @@ CREATE TABLE IF NOT EXISTS `item` (
        `uri` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
        `contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-       `gcontact-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
        `type` varchar(20) NOT NULL DEFAULT '' COMMENT '',
        `wall` boolean NOT NULL DEFAULT '0' COMMENT '',
        `gravity` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
@@ -467,6 +466,7 @@ CREATE TABLE IF NOT EXISTS `item` (
        `author-link` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `author-avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `title` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+       `content-warning` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `body` mediumtext COMMENT '',
        `app` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `verb` varchar(100) NOT NULL DEFAULT '' COMMENT '',
@@ -513,6 +513,7 @@ CREATE TABLE IF NOT EXISTS `item` (
         INDEX `uid_id` (`uid`,`id`),
         INDEX `uid_contactid_id` (`uid`,`contact-id`,`id`),
         INDEX `uid_created` (`uid`,`created`),
+        INDEX `uid_commented` (`uid`,`commented`),
         INDEX `uid_unseen_contactid` (`uid`,`unseen`,`contact-id`),
         INDEX `uid_network_received` (`uid`,`network`,`received`),
         INDEX `uid_network_commented` (`uid`,`network`,`commented`),
@@ -948,7 +949,6 @@ CREATE TABLE IF NOT EXISTS `thread` (
        `iid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
        `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
        `contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-       `gcontact-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
        `owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
        `author-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
        `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',