Merge branch 'master' into develop

[friendica.git] / src / Database / DBStructure.php

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 7ab91a6e1104d58a4449e2bd5d1b7c21cded2438..9e6ce5b97f834b9aaedc82b08fe91a50c473beb6 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -715,16 +715,16 @@ class DBStructure
                                                ]
                                ];
                $database["cache"] = [
-                               "comment" => "Used to store different data that doesn't to be stored for a long time",
+                               "comment" => "Stores temporary data",
                                "fields" => [
-                                               "k" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => ""],
-                                               "v" => ["type" => "mediumtext", "comment" => ""],
-                                               "expire_mode" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-                                               "updated" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
+                                               "k" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => "cache key"],
+                                               "v" => ["type" => "mediumtext", "comment" => "cached serialized value"],
+                                               "expires" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "datetime of cache expiration"],
+                                               "updated" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "datetime of cache insertion"],
                                                ],
                                "indexes" => [
                                                "PRIMARY" => ["k"],
-                                               "expire_mode_updated" => ["expire_mode", "updated"],
+                                               "k_expires" => ["k", "expires"],
                                                ]
                                ];
                $database["challenge"] = [