]> git.mxchange.org Git - friendica.git/blobdiff - include/dbstructure.php
Merge pull request #3323 from Alkarex/ostatus-only_full_group_by
[friendica.git] / include / dbstructure.php
index 56d2a170338a41a093e2c2d0178ee9d605288550..373d6ddb00ec1113ddf2def87cfd8191998cfc24 100644 (file)
@@ -1,4 +1,7 @@
 <?php
+
+use \Friendica\Core\Config;
+
 require_once("boot.php");
 require_once("include/text.php");
 
@@ -75,8 +78,18 @@ function update_fail($update_id, $error_message){
 function table_structure($table) {
        $structures = q("DESCRIBE `%s`", $table);
 
+       $full_columns = q("SHOW FULL COLUMNS FROM `%s`", $table);
+
        $indexes = q("SHOW INDEX FROM `%s`", $table);
 
+       $table_status = q("SHOW TABLE STATUS WHERE `name` = '%s'", $table);
+
+       if (dbm::is_result($table_status)) {
+               $table_status = $table_status[0];
+       } else {
+               $table_status = array();
+       }
+
        $fielddata = array();
        $indexdata = array();
 
@@ -101,7 +114,6 @@ function table_structure($table) {
 
                        $indexdata[$index["Key_name"]][] = $column;
                }
-
        if (dbm::is_result($structures)) {
                foreach ($structures AS $field) {
                        $fielddata[$field["Field"]]["type"] = $field["Type"];
@@ -122,10 +134,16 @@ function table_structure($table) {
                        }
                }
        }
-       return(array("fields"=>$fielddata, "indexes"=>$indexdata));
+       if (dbm::is_result($full_columns)) {
+               foreach ($full_columns AS $column) {
+                       $fielddata[$column["Field"]]["Collation"] = $column["Collation"];
+               }
+       }
+
+       return array("fields" => $fielddata, "indexes" => $indexdata, "table_status" => $table_status);
 }
 
-function print_structure($database, $charset) {
+function print_structure($database) {
        echo "-- ------------------------------------------\n";
        echo "-- ".FRIENDICA_PLATFORM." ".FRIENDICA_VERSION." (".FRIENDICA_CODENAME,")\n";
        echo "-- DB_UPDATE_VERSION ".DB_UPDATE_VERSION."\n";
@@ -134,7 +152,7 @@ function print_structure($database, $charset) {
                echo "--\n";
                echo "-- TABLE $name\n";
                echo "--\n";
-               db_create_table($name, $structure['fields'], $charset, true, false, $structure["indexes"]);
+               db_create_table($name, $structure['fields'], true, false, $structure["indexes"]);
 
                echo "\n";
        }
@@ -144,13 +162,8 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
        global $a, $db;
 
        if ($action) {
-               set_config('system', 'maintenance', 1);
-       }
-
-       if (isset($a->config["system"]["db_charset"])) {
-               $charset = $a->config["system"]["db_charset"];
-       } else {
-               $charset = "utf8";
+               Config::set('system', 'maintenance', 1);
+               Config::set('system', 'maintenance_reason', sprintf(t(': Database update'), dbm::date().' '.date('e')));
        }
 
        $errors = false;
@@ -164,16 +177,18 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                $tables = q("SHOW TABLES");
        }
 
-       foreach ($tables AS $table) {
-               $table = current($table);
+       if (dbm::is_result($tables)) {
+               foreach ($tables AS $table) {
+                       $table = current($table);
 
-               logger(sprintf('updating structure for table %s ...', $table), LOGGER_DEBUG);
-               $database[$table] = table_structure($table);
+                       logger(sprintf('updating structure for table %s ...', $table), LOGGER_DEBUG);
+                       $database[$table] = table_structure($table);
+               }
        }
 
        // Get the definition
        if (is_null($definition)) {
-               $definition = db_definition($charset);
+               $definition = db_definition();
        }
 
        // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
@@ -187,9 +202,10 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
        // Compare it
        foreach ($definition AS $name => $structure) {
                $is_new_table = False;
-               $sql3="";
+               $group_by = "";
+               $sql3 = "";
                if (!isset($database[$name])) {
-                       $r = db_create_table($name, $structure["fields"], $charset, $verbose, $action, $structure['indexes']);
+                       $r = db_create_table($name, $structure["fields"], $verbose, $action, $structure['indexes']);
                        if (!dbm::is_result($r)) {
                                $errors .=  t('Errors encountered creating database tables.').$name.EOL;
                        }
@@ -208,10 +224,9 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                if ($current_index_definition != $new_index_definition) {
                                        if ($fieldnames[0] == "UNIQUE") {
                                                $is_unique = true;
-                                               // Deactivated. See below for the reason
-                                               //if ($ignore == "") {
-                                               //      $temp_name = "temp-".$name;
-                                               //}
+                                               if ($ignore == "") {
+                                                       $temp_name = "temp-".$name;
+                                               }
                                        }
                                }
                        }
@@ -242,23 +257,31 @@ 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;
                                        }
                                } else {
                                        // Compare the field definition
-                                       $current_field_definition = implode(",",$database[$name]["fields"][$fieldname]);
-                                       $new_field_definition = implode(",",$parameters);
+                                       $field_definition = $database[$name]["fields"][$fieldname];
+
+                                       // Define the default collation if not given
+                                       if (!isset($parameters['Collation']) AND !is_null($field_definition['Collation'])) {
+                                               $parameters['Collation'] = 'utf8mb4_general_ci';
+                                       } else {
+                                               $parameters['Collation'] = null;
+                                       }
+
+                                       $current_field_definition = implode(",", $field_definition);
+                                       $new_field_definition = implode(",", $parameters);
                                        if ($current_field_definition != $new_field_definition) {
-                                               $sql2=db_modify_table_field($fieldname, $parameters);
+                                               $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;
                                                }
                                        }
-
                                }
                        }
                }
@@ -277,12 +300,30 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                }
                                $new_index_definition = implode(",",$fieldnames);
                                if ($current_index_definition != $new_index_definition) {
-                                       $sql2=db_create_index($indexname, $fieldnames);
+                                       $sql2 = db_create_index($indexname, $fieldnames);
+
+                                       // Fetch the "group by" fields for unique indexes
+                                       if ($fieldnames[0] == "UNIQUE") {
+                                               $group_by = db_group_by($indexname, $fieldnames);
+                                       }
                                        if ($sql2 != "") {
-                                               if ($sql3 == "")
+                                               if ($sql3 == "") {
                                                        $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
-                                               else
+                                               } else {
                                                        $sql3 .= ", ".$sql2;
+                                               }
+                                       }
+                               }
+                       }
+
+                       if (isset($database[$name]["table_status"]["Collation"])) {
+                               if ($database[$name]["table_status"]["Collation"] != 'utf8mb4_general_ci') {
+                                       $sql2 = "DEFAULT COLLATE utf8mb4_general_ci";
+
+                                       if ($sql3 == "") {
+                                               $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
+                                       } else {
+                                               $sql3 .= ", ".$sql2;
                                        }
                                }
                        }
@@ -293,44 +334,40 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                        if ($verbose) {
                                // Ensure index conversion to unique removes duplicates
                                if ($is_unique) {
-                                       // By now the alternative is commented out.
-                                       // This is a preparation for the time when we found a good SQL routine.
-                                       //if ($ignore != "") {
+                                       if ($ignore != "") {
                                                echo "SET session old_alter_table=1;\n";
-                                       //} else {
-                                       //      echo "CREATE TABLE `".$temp_name."` LIKE `".$name."`;\n";
-                                       //}
+                                       } else {
+                                               echo "CREATE TABLE `".$temp_name."` LIKE `".$name."`;\n";
+                                       }
                                }
 
                                echo $sql3."\n";
 
                                if ($is_unique) {
-                                       // By now the alternative is commented out.
-                                       // This is a preparation for the time when we found a good SQL routine.
-                                       //if ($ignore != "") {
+                                       if ($ignore != "") {
                                                echo "SET session old_alter_table=0;\n";
-                                       //} else {
-                                       //      echo "INSERT IGNORE INTO `".$temp_name."` SELECT * FROM `".$name."`;\n";
-                                       //      echo "DROP TABLE `".$name."`;\n";
-                                       //      echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n";
-                                       //}
+                                       } else {
+                                               echo "INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";\n";
+                                               echo "DROP TABLE `".$name."`;\n";
+                                               echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n";
+                                       }
                                }
                        }
 
                        if ($action) {
+                               Config::set('system', 'maintenance_reason', sprintf(t('%s: updating %s table.'), dbm::date().' '.date('e'), $name));
+
                                // Ensure index conversion to unique removes duplicates
                                if ($is_unique) {
-                                       // By now the alternative is commented out.
-                                       // This is a preparation for the time when we found a good SQL routine.
-                                       //if ($ignore != "") {
+                                       if ($ignore != "") {
                                                $db->q("SET session old_alter_table=1;");
-                                       //} else {
-                                       //      $r = $db->q("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
-                                       //      if (!dbm::is_result($r)) {
-                                       //              $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
-                                       //              return $errors;
-                                       //      }
-                                       //}
+                                       } else {
+                                               $r = $db->q("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
+                                               if (!dbm::is_result($r)) {
+                                                       $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
+                                                       return $errors;
+                                               }
+                                       }
                                }
 
                                $r = @$db->q($sql3);
@@ -338,35 +375,34 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                        $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
 
                                if ($is_unique) {
-                                       // By now the alternative is commented out.
-                                       // This is a preparation for the time when we found a good SQL routine.
-                                       //if ($ignore != "") {
+                                       if ($ignore != "") {
                                                $db->q("SET session old_alter_table=0;");
-                                       //} else {
-                                       //      We have to check if "INSERT IGNORE" will work on newer MySQL versions
-                                       //      $r = $db->q("INSERT IGNORE INTO `".$temp_name."` SELECT * FROM `".$name."`;");
-                                       //      if (!dbm::is_result($r)) {
-                                       //              $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
-                                       //              return $errors;
-                                       //      }
-                                       //      $r = $db->q("DROP TABLE `".$name."`;");
-                                       //      if (!dbm::is_result($r)) {
-                                       //              $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
-                                       //              return $errors;
-                                       //      }
-                                       //      $r = $db->q("RENAME TABLE `".$temp_name."` TO `".$name."`;");
-                                       //      if (!dbm::is_result($r)) {
-                                       //              $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
-                                       //              return $errors;
-                                       //      }
-                                       //}
+                                       } else {
+                                               $r = $db->q("INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";");
+                                               if (!dbm::is_result($r)) {
+                                                       $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
+                                                       return $errors;
+                                               }
+                                               $r = $db->q("DROP TABLE `".$name."`;");
+                                               if (!dbm::is_result($r)) {
+                                                       $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
+                                                       return $errors;
+                                               }
+                                               $r = $db->q("RENAME TABLE `".$temp_name."` TO `".$name."`;");
+                                               if (!dbm::is_result($r)) {
+                                                       $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
+                                                       return $errors;
+                                               }
+                                       }
                                }
                        }
                }
        }
 
-       if ($action)
-               set_config('system', 'maintenance', 0);
+       if ($action) {
+               Config::set('system', 'maintenance', 0);
+               Config::set('system', 'maintenance_reason', '');
+       }
 
        return $errors;
 }
@@ -374,6 +410,10 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 function db_field_command($parameters, $create = true) {
        $fieldstruct = $parameters["type"];
 
+       if (!is_null($parameters["Collation"])) {
+               $fieldstruct .= " COLLATE ".$parameters["Collation"];
+       }
+
        if ($parameters["not null"])
                $fieldstruct .= " NOT NULL";
 
@@ -393,7 +433,7 @@ function db_field_command($parameters, $create = true) {
        return($fieldstruct);
 }
 
-function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=null) {
+function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
        global $a, $db;
 
        $r = true;
@@ -418,7 +458,7 @@ function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=n
 
        $sql = implode(",\n\t", $sql_rows);
 
-       $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT CHARSET=".$charset;
+       $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT COLLATE utf8mb4_general_ci";
        if ($verbose)
                echo $sql.";\n";
 
@@ -477,25 +517,38 @@ function db_create_index($indexname, $fieldnames, $method="ADD") {
        return($sql);
 }
 
-function db_index_suffix($charset, $reduce = 0) {
-       if ($charset != "utf8mb4") {
+function db_group_by($indexname, $fieldnames) {
+
+       if ($fieldnames[0] != "UNIQUE") {
                return "";
        }
 
-       // On utf8mb4 indexes can only have a length of 191
-       $indexlength = 191 - $reduce;
+       array_shift($fieldnames);
+
+       $names = "";
+       foreach ($fieldnames AS $fieldname) {
+               if ($names != "")
+                       $names .= ",";
+
+               if (preg_match('|(.+)\((\d+)\)|', $fieldname, $matches)) {
+                       $names .= "`".dbesc($matches[1])."`";
+               } else {
+                       $names .= "`".dbesc($fieldname)."`";
+               }
+       }
 
-       return "(".$indexlength.")";
+       $sql = sprintf(" GROUP BY %s", $names);
+       return $sql;
 }
 
-function db_definition($charset) {
+function db_definition() {
 
        $database = array();
 
        $database["addon"] = array(
                        "fields" => array(
                                        "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-                                       "name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+                                       "name" => array("type" => "varchar(190)", "not null" => "1", "default" => ""),
                                        "version" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "installed" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "hidden" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@@ -504,6 +557,7 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
+                                       "name" => array("UNIQUE", "name"),
                                        )
                        );
        $database["attach"] = array(
@@ -515,12 +569,12 @@ function db_definition($charset) {
                                        "filetype" => array("type" => "varchar(64)", "not null" => "1", "default" => ""),
                                        "filesize" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "data" => array("type" => "longblob", "not null" => "1"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "allow_cid" => array("type" => "mediumtext"),
-                                       "allow_gid" => array("type" => "medium_text"),
-                                       "deny_cid" => array("type" => "medium_text"),
-                                       "deny_gid" => array("type" => "medium_text"),
+                                       "allow_gid" => array("type" => "mediumtext"),
+                                       "deny_cid" => array("type" => "mediumtext"),
+                                       "deny_gid" => array("type" => "mediumtext"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -543,7 +597,7 @@ function db_definition($charset) {
                                        "k" => array("type" => "varbinary(255)", "not null" => "1", "primary" => "1"),
                                        "v" => array("type" => "mediumtext"),
                                        "expire_mode" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("k"),
@@ -592,7 +646,7 @@ function db_definition($charset) {
                        "fields" => array(
                                        "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "self" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "remote_self" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "rel" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@@ -630,21 +684,21 @@ function db_definition($charset) {
                                        "usehub" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "subhub" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "hub-verify" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "last-update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "success_update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "failure_update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "name-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "uri-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "avatar-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "term-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "last-item" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "last-update" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "success_update" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "failure_update" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "name-date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "uri-date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "avatar-date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "term-date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "last-item" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "priority" => array("type" => "tinyint(3)", "not null" => "1", "default" => "0"),
                                        "blocked" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
                                        "readonly" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "writable" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "forum" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "prv" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
-                                       "contact-type" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
+                                       "contact-type" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "hidden" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "archive" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "pending" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
@@ -682,8 +736,8 @@ function db_definition($charset) {
                                        "recips" => array("type" => "text"),
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "creator" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "subject" => array("type" => "text"),
                                        ),
                        "indexes" => array(
@@ -691,18 +745,6 @@ function db_definition($charset) {
                                        "uid" => array("uid"),
                                        )
                        );
-       $database["deliverq"] = array(
-                       "fields" => array(
-                                       "id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-                                       "cmd" => array("type" => "varbinary(32)", "not null" => "1", "default" => ""),
-                                       "item" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "contact" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       ),
-                       "indexes" => array(
-                                       "PRIMARY" => array("id"),
-                                       "cmd_item_contact" => array("UNIQUE", "cmd", "item", "contact"),
-                                       )
-                       );
        $database["event"] = array(
                        "fields" => array(
                                        "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
@@ -710,10 +752,10 @@ function db_definition($charset) {
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "cid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "uri" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "start" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "finish" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "start" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "finish" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "summary" => array("type" => "text"),
                                        "desc" => array("type" => "text"),
                                        "location" => array("type" => "text"),
@@ -721,10 +763,10 @@ function db_definition($charset) {
                                        "nofinish" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "adjust" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
                                        "ignore" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
-                                       "allow_cid" => array("type" => "medium_text"),
-                                       "allow_gid" => array("type" => "medium_text"),
-                                       "deny_cid" => array("type" => "medium_text"),
-                                       "deny_gid" => array("type" => "medium_text"),
+                                       "allow_cid" => array("type" => "mediumtext"),
+                                       "allow_gid" => array("type" => "mediumtext"),
+                                       "deny_cid" => array("type" => "mediumtext"),
+                                       "deny_gid" => array("type" => "mediumtext"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -749,7 +791,7 @@ function db_definition($charset) {
                                        "network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
                                        "alias" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "pubkey" => array("type" => "text"),
-                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -790,7 +832,7 @@ function db_definition($charset) {
                                        "request" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "note" => array("type" => "text"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -817,10 +859,10 @@ function db_definition($charset) {
                                        "nurl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "connect" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "updated" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
-                                       "last_contact" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
-                                       "last_failure" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "updated" => array("type" => "datetime", "default" => NULL_DATE),
+                                       "last_contact" => array("type" => "datetime", "default" => NULL_DATE),
+                                       "last_failure" => array("type" => "datetime", "default" => NULL_DATE),
                                        "location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "about" => array("type" => "text"),
                                        "keywords" => array("type" => "text"),
@@ -839,10 +881,10 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "nurl" => array("nurl(32)"),
-                                       "name" => array("name(32)"),
+                                       "nurl" => array("nurl(64)"),
+                                       "name" => array("name(64)"),
                                        "nick" => array("nick(32)"),
-                                       "addr" => array("addr(32)"),
+                                       "addr" => array("addr(64)"),
                                        "hide_network_updated" => array("hide", "network", "updated"),
                                        "updated" => array("updated"),
                                        )
@@ -854,7 +896,7 @@ function db_definition($charset) {
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "gcid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "zcid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -902,10 +944,10 @@ function db_definition($charset) {
                                        "noscrape" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
                                        "platform" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "last_poco_query" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
-                                       "last_contact" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
-                                       "last_failure" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "last_poco_query" => array("type" => "datetime", "default" => NULL_DATE),
+                                       "last_contact" => array("type" => "datetime", "default" => NULL_DATE),
+                                       "last_failure" => array("type" => "datetime", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -922,7 +964,7 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "hook_file_function" => array("hook(30)","file(60)","function(30)"),
+                                       "hook_file_function" => array("UNIQUE", "hook(50)","file(80)","function(60)"),
                                        )
                        );
        $database["intro"] = array(
@@ -935,7 +977,7 @@ function db_definition($charset) {
                                        "duplex" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "note" => array("type" => "text"),
                                        "hash" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "datetime" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "datetime" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "blocked" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
                                        "ignore" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        ),
@@ -958,11 +1000,11 @@ function db_definition($charset) {
                                        "parent-uri" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "extid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "thr-parent" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "commented" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "received" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "changed" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "commented" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "received" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "changed" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "owner-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "owner-name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "owner-link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1019,6 +1061,7 @@ function db_definition($charset) {
                                        "parent-uri" => array("parent-uri"),
                                        "extid" => array("extid"),
                                        "uid_id" => array("uid","id"),
+                                       "uid_contactid_id" => array("uid","contact-id","id"),
                                        "uid_created" => array("uid","created"),
                                        "uid_unseen_contactid" => array("uid","unseen","contact-id"),
                                        "uid_network_received" => array("uid","network","received"),
@@ -1060,7 +1103,7 @@ function db_definition($charset) {
                                        "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "name" => array("type" => "varchar(128)", "not null" => "1", "default" => ""),
                                        "locked" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
-                                       "created" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -1084,7 +1127,7 @@ function db_definition($charset) {
                                        "unknown" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "uri" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "parent-uri" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -1108,7 +1151,7 @@ function db_definition($charset) {
                                        "action" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "movetofolder" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "pubmail" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
-                                       "last_check" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "last_check" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -1133,7 +1176,7 @@ function db_definition($charset) {
                                        "name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "msg" => array("type" => "mediumtext"),
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1169,7 +1212,7 @@ function db_definition($charset) {
                        "fields" => array(
                                        "url" => array("type" => "varbinary(255)", "not null" => "1", "primary" => "1"),
                                        "content" => array("type" => "mediumtext"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("url"),
@@ -1182,7 +1225,7 @@ function db_definition($charset) {
                                        "guessing" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0", "primary" => "1"),
                                        "oembed" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0", "primary" => "1"),
                                        "content" => array("type" => "mediumtext"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("url", "guessing", "oembed"),
@@ -1209,8 +1252,8 @@ function db_definition($charset) {
                                        "contact-id" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
                                        "guid" => array("type" => "varchar(64)", "not null" => "1", "default" => ""),
                                        "resource-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "title" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "desc" => array("type" => "text"),
                                        "album" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1272,7 +1315,7 @@ function db_definition($charset) {
                        "fields" => array(
                                        "pid" => array("type" => "int(10) unsigned", "not null" => "1", "primary" => "1"),
                                        "command" => array("type" => "varbinary(32)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("pid"),
@@ -1298,7 +1341,7 @@ function db_definition($charset) {
                                        "gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
                                        "marital" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "with" => array("type" => "text"),
-                                       "howlong" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "howlong" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "sexual" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "politic" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "religion" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1350,7 +1393,7 @@ function db_definition($charset) {
                                        "topic" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "nickname" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "push" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "last_update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "last_update" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "secret" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        ),
                        "indexes" => array(
@@ -1362,8 +1405,8 @@ function db_definition($charset) {
                                        "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "cid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "last" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "last" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "content" => array("type" => "mediumtext"),
                                        "batch" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        ),
@@ -1380,7 +1423,7 @@ function db_definition($charset) {
                        "fields" => array(
                                        "id" => array("type" => "int(11) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "hash" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "uid" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
                                        "password" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "language" => array("type" => "varchar(16)", "not null" => "1", "default" => ""),
@@ -1434,7 +1477,7 @@ function db_definition($charset) {
                                        "spam" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "ham" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "term" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -1453,8 +1496,8 @@ function db_definition($charset) {
                                        "term" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "guid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "received" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "received" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "global" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "aid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
                                        "uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
@@ -1475,11 +1518,11 @@ function db_definition($charset) {
                                        "gcontact-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
                                        "owner-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
                                        "author-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "commented" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "received" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "changed" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "commented" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "received" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "changed" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "wall" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "private" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "pubmail" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@@ -1504,6 +1547,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(
@@ -1530,8 +1574,8 @@ function db_definition($charset) {
                                        "openid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "timezone" => array("type" => "varchar(128)", "not null" => "1", "default" => ""),
                                        "language" => array("type" => "varchar(32)", "not null" => "1", "default" => "en"),
-                                       "register_date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "login_date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "register_date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "login_date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "default-location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "allow_location" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "theme" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1555,14 +1599,14 @@ function db_definition($charset) {
                                        "expire" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
                                        "account_removed" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "account_expired" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
-                                       "account_expires_on" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "expire_notification_sent" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "account_expires_on" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "expire_notification_sent" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "service_class" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
                                        "def_gid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "allow_cid" => array("type" => "medium_text"),
-                                       "allow_gid" => array("type" => "medium_text"),
-                                       "deny_cid" => array("type" => "medium_text"),
-                                       "deny_gid" => array("type" => "medium_text"),
+                                       "allow_cid" => array("type" => "mediumtext"),
+                                       "allow_gid" => array("type" => "mediumtext"),
+                                       "deny_cid" => array("type" => "mediumtext"),
+                                       "deny_gid" => array("type" => "mediumtext"),
                                        "openidserver" => array("type" => "text"),
                                        ),
                        "indexes" => array(
@@ -1585,9 +1629,9 @@ function db_definition($charset) {
                                        "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "parameter" => array("type" => "text"),
                                        "priority" => array("type" => "tinyint(3) unsigned", "not null" => "1", "default" => "0"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "pid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "executed" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "executed" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -1641,9 +1685,7 @@ function dbstructure_run(&$argv, &$argc) {
                                set_config('system','build',DB_UPDATE_VERSION);
                                return;
                        case "dumpsql":
-                               // For the dump that is used to create the database.sql we always assume utfmb4
-                               $charset = "utf8mb4";
-                               print_structure(db_definition($charset), $charset);
+                               print_structure(db_definition());
                                return;
                }
        }