Merge branch 'master' into develop

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index 181e9e804a00d73f01014629d24b95b59442d06f..591569ad5f40e25b7aaa0c282e69bb923d82a3dd 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,5 +1,5 @@
 -- ------------------------------------------
--- Friendica 3.6-rc (Asparagus)
+-- Friendica 2018-05-dev (Tazmans Flax-lilly)
 -- 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;
 
 --