code standards / simplifications

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

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index e6bbf220948b6c43606f425da2531cb1eb9e7f46..d3ce350a72d328f920a8c5cece17091d8fe64ef7 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -4,10 +4,9 @@
  */
 namespace Friendica\Database;
 
+use dba;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
-use dba;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -1242,12 +1241,10 @@ class DBStructure
                                                "ownerid" => ["owner-id"],
                                                "uid_uri" => ["uid", "uri(190)"],
                                                "resource-id" => ["resource-id"],
-                                               "contactid_allowcid_allowpid_denycid_denygid" => ["contact-id","allow_cid(10)","allow_gid(10)","deny_cid(10)","deny_gid(10)"], //
-                                               "uid_type_changed" => ["uid","type","changed"],
-                                               "contactid_verb" => ["contact-id","verb"],
                                                "deleted_changed" => ["deleted","changed"],
                                                "uid_wall_changed" => ["uid","wall","changed"],
                                                "uid_eventid" => ["uid","event-id"],
+                                               "icid" => ["icid"],
                                                ]
                                ];
                $database["item-content"] = [
@@ -1261,6 +1258,7 @@ class DBStructure
                                                "body" => ["type" => "mediumtext", "comment" => "item body content"],
                                                "location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "text location where this item originated"],
                                                "coord" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "longitude/latitude pair representing location where this item originated"],
+                                               "language" => ["type" => "text", "comment" => "Language information about this post"],
                                                "app" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "application which generated this item"],
                                                "rendered-hash" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
                                                "rendered-html" => ["type" => "mediumtext", "comment" => "item.body converted to html"],
@@ -1269,6 +1267,7 @@ class DBStructure
                                                "target-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams target type if applicable (URI)"],
                                                "target" => ["type" => "text", "comment" => "JSON encoded target structure if used"],
                                                "plink" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "permalink or URL to a displayable copy of the message at its source"],
+                                               "verb" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams verb"],
                                                ],
                                "indexes" => [
                                                "PRIMARY" => ["id"],
@@ -1283,9 +1282,11 @@ class DBStructure
                                                "name" => ["type" => "varchar(128)", "not null" => "1", "default" => "", "comment" => ""],
                                                "locked" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
                                                "pid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => "Process ID"],
-                                               ],
+                                               "expires" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "datetime of cache expiration"],
+                               ],
                                "indexes" => [
                                                "PRIMARY" => ["id"],
+                                               "name_expires" => ["name", "expires"]
                                                ]
                                ];
                $database["mail"] = [
@@ -1713,7 +1714,6 @@ class DBStructure
                                                "created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
                                                "received" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
                                                "global" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-                                               "aid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
                                                "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
                                                ],
                                "indexes" => [