Merge remote-tracking branch 'upstream/develop' into 1702-detect-server

[friendica.git] / include / dbstructure.php

diff --git a/include/dbstructure.php b/include/dbstructure.php
index f8d084437b16ed18342855b693a3dcc15573a585..4ad54e6ba2485ba5b53afb2a77c1a2868b66f09c 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -242,7 +242,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                if (!isset($database[$name]["fields"][$fieldname])) {
                                        $sql2=db_add_table_field($fieldname, $parameters);
                                        if ($sql3 == "") {
-                                               $sql3 = "ALTER TABLE `".$temp_name."` ".$sql2;
+                                               $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
                                        } else {
                                                $sql3 .= ", ".$sql2;
                                        }
@@ -253,7 +253,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                        if ($current_field_definition != $new_field_definition) {
                                                $sql2=db_modify_table_field($fieldname, $parameters);
                                                if ($sql3 == "") {
-                                                       $sql3 = "ALTER TABLE `".$temp_name."` ".$sql2;
+                                                       $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
                                                } else {
                                                        $sql3 .= ", ".$sql2;
                                                }
@@ -1526,6 +1526,7 @@ function db_definition($charset) {
                                        "uid_contactid_created" => array("uid","contact-id","created"),
                                        "uid_created" => array("uid","created"),
                                        "uid_commented" => array("uid","commented"),
+                                       "uid_wall_created" => array("uid","wall","created"),
                                        )
                        );
        $database["tokens"] = array(