]> git.mxchange.org Git - friendica.git/blobdiff - include/dbstructure.php
Resubmit all profiles on directory change
[friendica.git] / include / dbstructure.php
index be1158eabec341f02c56c69a3834091ac2704f2c..59f19e9bbc5be0e2c1c10764adb14938677c8651 100644 (file)
@@ -1,4 +1,7 @@
 <?php
+
+use \Friendica\Core\Config;
+
 require_once("boot.php");
 require_once("include/text.php");
 
@@ -26,7 +29,6 @@ function update_fail($update_id, $error_message){
        }
 
        // every admin could had different language
-
        foreach ($adminlist as $admin) {
                $lang = (($admin['language'])?$admin['language']:'en');
                push_lang($lang);
@@ -76,15 +78,26 @@ 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();
 
        if (dbm::is_result($indexes))
                foreach ($indexes AS $index) {
-                       if ($index["Index_type"] == "FULLTEXT")
+                       if ($index["Index_type"] == "FULLTEXT") {
                                continue;
+                       }
 
                        if ($index['Key_name'] != 'PRIMARY' && $index['Non_unique'] == '0' && !isset($indexdata[$index["Key_name"]])) {
                                $indexdata[$index["Key_name"]] = array('UNIQUE');
@@ -95,32 +108,42 @@ function table_structure($table) {
                        // To avoid the need to add this to every index definition we just ignore it here.
                        // Exception are primary indexes
                        // Since there are some combindex primary indexes we use the limit of 180 here.
-                       if (($index["Sub_part"] != "") AND (($index["Sub_part"] < 180) OR ($index["Key_name"] == "PRIMARY")))
+                       if (($index["Sub_part"] != "") AND (($index["Sub_part"] < 180) OR ($index["Key_name"] == "PRIMARY"))) {
                                $column .= "(".$index["Sub_part"].")";
+                       }
 
                        $indexdata[$index["Key_name"]][] = $column;
                }
-
        if (dbm::is_result($structures)) {
-               foreach($structures AS $field) {
+               foreach ($structures AS $field) {
                        $fielddata[$field["Field"]]["type"] = $field["Type"];
-                       if ($field["Null"] == "NO")
+                       if ($field["Null"] == "NO") {
                                $fielddata[$field["Field"]]["not null"] = true;
+                       }
 
-                       if (isset($field["Default"]))
+                       if (isset($field["Default"])) {
                                $fielddata[$field["Field"]]["default"] = $field["Default"];
+                       }
 
-                       if ($field["Extra"] != "")
+                       if ($field["Extra"] != "") {
                                $fielddata[$field["Field"]]["extra"] = $field["Extra"];
+                       }
 
-                       if ($field["Key"] == "PRI")
+                       if ($field["Key"] == "PRI") {
                                $fielddata[$field["Field"]]["primary"] = true;
+                       }
+               }
+       }
+       if (dbm::is_result($full_columns)) {
+               foreach ($full_columns AS $column) {
+                       $fielddata[$column["Field"]]["Collation"] = $column["Collation"];
                }
        }
-       return(array("fields"=>$fielddata, "indexes"=>$indexdata));
+
+       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";
@@ -129,22 +152,34 @@ 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";
        }
 }
 
+/**
+ * @brief Print out database error messages
+ *
+ * @param object $db Database object
+ * @param string $message Message to be added to the error message
+ *
+ * @return string Error message
+ */
+function print_update_error($db, $message) {
+       echo sprintf(t("\nError %d occured during database update:\n%s\n"),
+               $db->errorno, $db->error);
+
+       return t('Errors encountered performing database changes: ').$message.EOL;
+}
+
 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";
+       if ($action) {
+               Config::set('system', 'maintenance', 1);
+               Config::set('system', 'maintenance_reason', sprintf(t(': Database update'), dbm::date().' '.date('e')));
+       }
 
        $errors = false;
 
@@ -153,50 +188,70 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
        // Get the current structure
        $database = array();
 
-       if (is_null($tables))
-               $tables = q("show tables");
+       if (is_null($tables)) {
+               $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);
-
-       // Ensure index conversion to unique removes duplicates
-       $sql_config = "SET session old_alter_table=1;";
-       if ($verbose)
-               echo $sql_config."\n";
-       if ($action)
-               @$db->q($sql_config);
+       if (is_null($definition)) {
+               $definition = db_definition();
+       }
 
        // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
        if ((version_compare($db->server_info(), '5.7.4') >= 0) AND
                !(strpos($db->server_info(), 'MariaDB') !== false)) {
                $ignore = '';
-       }else {
+       } else {
                $ignore = ' IGNORE';
        }
 
        // 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;
+                               $errors .= print_update_error($db, $name);
                        }
                        $is_new_table = True;
                } else {
-                       // Drop the index if it isn't present in the definition
-                       // or the definition differ from current status
-                       // and index name doesn't start with "local_"
-                       foreach ($database[$name]["indexes"] AS $indexname => $fieldnames) {
+                       $is_unique = false;
+                       $temp_name = $name;
+
+                       foreach ($structure["indexes"] AS $indexname => $fieldnames) {
+                               if (isset($database[$name]["indexes"][$indexname])) {
+                                       $current_index_definition = implode(",",$database[$name]["indexes"][$indexname]);
+                               } else {
+                                       $current_index_definition = "__NOT_SET__";
+                               }
+                               $new_index_definition = implode(",",$fieldnames);
+                               if ($current_index_definition != $new_index_definition) {
+                                       if ($fieldnames[0] == "UNIQUE") {
+                                               $is_unique = true;
+                                               if ($ignore == "") {
+                                                       $temp_name = "temp-".$name;
+                                               }
+                                       }
+                               }
+                       }
+
+                       /*
+                        * Drop the index if it isn't present in the definition
+                        * or the definition differ from current status
+                        * and index name doesn't start with "local_"
+                        */
+                       foreach ($database[$name]["indexes"] as $indexname => $fieldnames) {
                                $current_index_definition = implode(",",$fieldnames);
                                if (isset($structure["indexes"][$indexname])) {
                                        $new_index_definition = implode(",",$structure["indexes"][$indexname]);
@@ -205,39 +260,52 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                }
                                if ($current_index_definition != $new_index_definition && substr($indexname, 0, 6) != 'local_') {
                                        $sql2=db_drop_index($indexname);
-                                       if ($sql3 == "")
-                                               $sql3 = "ALTER".$ignore." TABLE `".$name."` ".$sql2;
-                                       else
+                                       if ($sql3 == "") {
+                                               $sql3 = "ALTER".$ignore." TABLE `".$temp_name."` ".$sql2;
+                                       } else {
                                                $sql3 .= ", ".$sql2;
+                                       }
                                }
                        }
                        // Compare the field structure field by field
                        foreach ($structure["fields"] AS $fieldname => $parameters) {
                                if (!isset($database[$name]["fields"][$fieldname])) {
                                        $sql2=db_add_table_field($fieldname, $parameters);
-                                       if ($sql3 == "")
-                                               $sql3 = "ALTER TABLE `".$name."` ".$sql2;
-                                       else
+                                       if ($sql3 == "") {
+                                               $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);
-                                               if ($sql3 == "")
-                                                       $sql3 = "ALTER TABLE `".$name."` ".$sql2;
-                                               else
+                                               $sql2 = db_modify_table_field($fieldname, $parameters);
+                                               if ($sql3 == "") {
+                                                       $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
+                                               } else {
                                                        $sql3 .= ", ".$sql2;
+                                               }
                                        }
-
                                }
                        }
                }
 
-               // Create the index if the index don't exists in database
-               // or the definition differ from the current status.
-               // Don't create keys if table is new
+               /*
+                * Create the index if the index don't exists in database
+                * or the definition differ from the current status.
+                * Don't create keys if table is new
+                */
                if (!$is_new_table) {
                        foreach ($structure["indexes"] AS $indexname => $fieldnames) {
                                if (isset($database[$name]["indexes"][$indexname])) {
@@ -247,12 +315,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 == "")
-                                                       $sql3 = "ALTER" . $ignore . " TABLE `".$name."` ".$sql2;
-                                               else
+                                               if ($sql3 == "") {
+                                                       $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
+                                               } 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;
                                        }
                                }
                        }
@@ -260,19 +346,78 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                if ($sql3 != "") {
                        $sql3 .= ";";
 
-                       if ($verbose)
+                       if ($verbose) {
+                               // Ensure index conversion to unique removes duplicates
+                               if ($is_unique) {
+                                       if ($ignore != "") {
+                                               echo "SET session old_alter_table=1;\n";
+                                       } else {
+                                               echo "CREATE TABLE `".$temp_name."` LIKE `".$name."`;\n";
+                                       }
+                               }
+
                                echo $sql3."\n";
 
+                               if ($is_unique) {
+                                       if ($ignore != "") {
+                                               echo "SET session old_alter_table=0;\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) {
+                                       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 .= print_update_error($db, $sql3);
+                                                       return $errors;
+                                               }
+                                       }
+                               }
+
                                $r = @$db->q($sql3);
-                               if (dbm::is_result($r))
-                                       $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
+                               if (!dbm::is_result($r)) {
+                                       $errors .= print_update_error($db, $sql3);
+                               }
+                               if ($is_unique) {
+                                       if ($ignore != "") {
+                                               $db->q("SET session old_alter_table=0;");
+                                       } else {
+                                               $r = $db->q("INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";");
+                                               if (!dbm::is_result($r)) {
+                                                       $errors .= print_update_error($db, $sql3);
+                                                       return $errors;
+                                               }
+                                               $r = $db->q("DROP TABLE `".$name."`;");
+                                               if (!dbm::is_result($r)) {
+                                                       $errors .= print_update_error($db, $sql3);
+                                                       return $errors;
+                                               }
+                                               $r = $db->q("RENAME TABLE `".$temp_name."` TO `".$name."`;");
+                                               if (!dbm::is_result($r)) {
+                                                       $errors .= print_update_error($db, $sql3);
+                                                       return $errors;
+                                               }
+                                       }
+                               }
                        }
                }
        }
 
-       if ($action)
-               set_config('system', 'maintenance', 0);
+       if ($action) {
+               Config::set('system', 'maintenance', 0);
+               Config::set('system', 'maintenance_reason', '');
+       }
 
        return $errors;
 }
@@ -280,6 +425,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";
 
@@ -299,7 +448,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;
@@ -324,7 +473,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";
 
@@ -367,10 +516,11 @@ function db_create_index($indexname, $fieldnames, $method="ADD") {
                if ($names != "")
                        $names .= ",";
 
-               if (preg_match('|(.+)\((\d+)\)|', $fieldname, $matches))
+               if (preg_match('|(.+)\((\d+)\)|', $fieldname, $matches)) {
                        $names .= "`".dbesc($matches[1])."`(".intval($matches[2]).")";
-               else
+               } else {
                        $names .= "`".dbesc($fieldname)."`";
+               }
        }
 
        if ($indexname == "PRIMARY") {
@@ -382,24 +532,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);
 
-       return "(".$indexlength.")";
+       $names = "";
+       foreach ($fieldnames AS $fieldname) {
+               if ($names != "")
+                       $names .= ",";
+
+               if (preg_match('|(.+)\((\d+)\)|', $fieldname, $matches)) {
+                       $names .= "`".dbesc($matches[1])."`";
+               } else {
+                       $names .= "`".dbesc($fieldname)."`";
+               }
+       }
+
+       $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"),
@@ -408,6 +572,7 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
+                                       "name" => array("UNIQUE", "name"),
                                        )
                        );
        $database["attach"] = array(
@@ -419,8 +584,8 @@ 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" => "mediumtext"),
                                        "deny_cid" => array("type" => "mediumtext"),
@@ -444,14 +609,13 @@ function db_definition($charset) {
                        );
        $database["cache"] = array(
                        "fields" => array(
-                                       "k" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"),
-                                       "v" => array("type" => "text"),
+                                       "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".db_index_suffix($charset)),
-                                       "updated" => array("updated"),
+                                       "PRIMARY" => array("k"),
                                        "expire_mode_updated" => array("expire_mode", "updated"),
                                        )
                        );
@@ -484,20 +648,20 @@ function db_definition($charset) {
        $database["config"] = array(
                        "fields" => array(
                                        "id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-                                       "cat" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "k" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "v" => array("type" => "text"),
+                                       "cat" => array("type" => "varbinary(255)", "not null" => "1", "default" => ""),
+                                       "k" => array("type" => "varbinary(255)", "not null" => "1", "default" => ""),
+                                       "v" => array("type" => "mediumtext"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "cat_k" => array("UNIQUE", "cat(30)","k(30)"),
+                                       "cat_k" => array("UNIQUE", "cat", "k"),
                                        )
                        );
        $database["contact"] = array(
                        "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"),
@@ -535,21 +699,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"),
@@ -559,56 +723,54 @@ function db_definition($charset) {
                                        "info" => array("type" => "mediumtext"),
                                        "profile-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "bdyear" => array("type" => "varchar(4)", "not null" => "1", "default" => ""),
-                                       "bd" => array("type" => "date", "not null" => "1", "default" => "0000-00-00"),
+                                       "bd" => array("type" => "date", "not null" => "1", "default" => "0001-01-01"),
                                        "notify_new_posts" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "fetch_further_information" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
-                                       "ffi_keyword_blacklist" => array("type" => "mediumtext"),
+                                       "ffi_keyword_blacklist" => array("type" => "text"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "uid" => array("uid"),
-                                       "addr_uid" => array("addr", "uid"),
-                                       "nurl" => array("nurl"),
+                                       "uid_name" => array("uid", "name"),
+                                       "self_uid" => array("self", "uid"),
+                                       "alias_uid" => array("alias(32)", "uid"),
+                                       "pending_uid" => array("pending", "uid"),
+                                       "blocked_uid" => array("blocked", "uid"),
+                                       "uid_rel_network_poll" => array("uid", "rel", "network", "poll(64)", "archive"),
+                                       "uid_network_batch" => array("uid", "network", "batch(64)"),
+                                       "addr_uid" => array("addr(32)", "uid"),
+                                       "nurl_uid" => array("nurl(32)", "uid"),
+                                       "nick_uid" => array("nick(32)", "uid"),
+                                       "dfrn-id" => array("dfrn-id"),
+                                       "issued-id" => array("issued-id"),
                                        )
                        );
        $database["conv"] = array(
                        "fields" => array(
                                        "id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "guid" => array("type" => "varchar(64)", "not null" => "1", "default" => ""),
-                                       "recips" => array("type" => "mediumtext"),
+                                       "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"),
-                                       "subject" => array("type" => "mediumtext"),
+                                       "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(
                                        "PRIMARY" => array("id"),
                                        "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" => "varchar(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"),
+                                       "guid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "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"),
@@ -623,7 +785,7 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "uid" => array("uid"),
+                                       "uid_start" => array("uid", "start"),
                                        )
                        );
        $database["fcontact"] = array(
@@ -644,11 +806,12 @@ 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"),
-                                       "addr" => array("addr"),
+                                       "addr" => array("addr(32)"),
+                                       "url" => array("url"),
                                        )
                        );
        $database["ffinder"] = array(
@@ -671,7 +834,7 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "server" => array("server"),
+                                       "server" => array("server(32)"),
                                        )
                        );
        $database["fsuggest"] = array(
@@ -684,7 +847,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"),
@@ -711,15 +874,15 @@ 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"),
                                        "gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
-                                       "birthday" => array("type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00"),
+                                       "birthday" => array("type" => "varchar(32)", "not null" => "1", "default" => "0001-01-01"),
                                        "community" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "contact-type" => array("type" => "tinyint(1)", "not null" => "1", "default" => "-1"),
                                        "hide" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@@ -733,10 +896,11 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "nurl" => array("nurl"),
-                                       "name" => array("name"),
-                                       "nick" => array("nick"),
-                                       "addr" => array("addr"),
+                                       "nurl" => array("nurl(64)"),
+                                       "name" => array("name(64)"),
+                                       "nick" => array("nick(32)"),
+                                       "addr" => array("addr(64)"),
+                                       "hide_network_updated" => array("hide", "network", "updated"),
                                        "updated" => array("updated"),
                                        )
                        );
@@ -747,13 +911,12 @@ 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"),
-                                       "cid_uid_gcid_zcid" => array("cid","uid","gcid","zcid"),
+                                       "cid_uid_gcid_zcid" => array("UNIQUE", "cid","uid","gcid","zcid"),
                                        "gcid" => array("gcid"),
-                                       "zcid" => array("zcid"),
                                        )
                        );
        $database["group"] = array(
@@ -778,7 +941,9 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "uid_gid_contactid" => array("uid","gid","contact-id"),
+                                       "contactid" => array("contact-id"),
+                                       "gid_contactid" => array("gid", "contact-id"),
+                                       "uid_gid_contactid" => array("UNIQUE", "uid", "gid", "contact-id"),
                                        )
                        );
        $database["gserver"] = array(
@@ -794,14 +959,14 @@ 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"),
-                                       "nurl" => array("nurl"),
+                                       "nurl" => array("nurl(32)"),
                                        )
                        );
        $database["hook"] = array(
@@ -814,7 +979,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(
@@ -827,7 +992,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"),
                                        ),
@@ -850,11 +1015,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" => ""),
@@ -911,29 +1076,18 @@ 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"),
-                                       "uid_received" => array("uid","received"),
                                        "uid_network_commented" => array("uid","network","commented"),
-                                       "uid_commented" => array("uid","commented"),
-                                       "uid_title" => array("uid","title"),
                                        "uid_thrparent" => array("uid","thr-parent"),
                                        "uid_parenturi" => array("uid","parent-uri"),
-                                       "uid_contactid_id" => array("uid","contact-id","id"),
                                        "uid_contactid_created" => array("uid","contact-id","created"),
-                                       "gcontactid_uid_created" => array("gcontact-id","uid","created"),
                                        "authorid_created" => array("author-id","created"),
-                                       "ownerid_created" => array("owner-id","created"),
-                                       "wall_body" => array("wall","body(6)"),
-                                       "uid_visible_moderated_created" => array("uid","visible","moderated","created"),
                                        "uid_uri" => array("uid", "uri"),
-                                       "uid_wall_created" => array("uid","wall","created"),
                                        "resource-id" => array("resource-id"),
-                                       "uid_type" => array("uid","type"),
-                                       "uid_starred_id" => array("uid","starred", "id"),
-                                       "contactid_allowcid_allowpid_denycid_denygid" => array("contact-id","allow_cid(10)","allow_gid(10)","deny_cid(10)","deny_gid(10)"),
-                                       "uid_wall_parent_created" => array("uid","wall","parent","created"),
+                                       "contactid_allowcid_allowpid_denycid_denygid" => array("contact-id","allow_cid(10)","allow_gid(10)","deny_cid(10)","deny_gid(10)"), //
                                        "uid_type_changed" => array("uid","type","changed"),
                                        "contactid_verb" => array("contact-id","verb"),
                                        "deleted_changed" => array("deleted","changed"),
@@ -955,7 +1109,7 @@ function db_definition($charset) {
                                        "PRIMARY" => array("id"),
                                        "uid" => array("uid"),
                                        "sid" => array("sid"),
-                                       "service" => array("service"),
+                                       "service" => array("service(32)"),
                                        "iid" => array("iid"),
                                        )
                        );
@@ -964,7 +1118,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"),
@@ -988,16 +1142,14 @@ 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"),
-                                       "uid" => array("uid"),
-                                       "guid" => array("guid"),
+                                       "uid_seen" => array("uid", "seen"),
                                        "convid" => array("convid"),
-                                       "reply" => array("reply"),
-                                       "uri" => array("uri"),
-                                       "parent-uri" => array("parent-uri"),
+                                       "uri" => array("uri(64)"),
+                                       "parent-uri" => array("parent-uri(64)"),
                                        )
                        );
        $database["mailacct"] = array(
@@ -1014,7 +1166,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"),
@@ -1028,7 +1180,7 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "uid_mid" => array("uid","mid"),
+                                       "uid_mid" => array("UNIQUE", "uid","mid"),
                                        )
                        );
        $database["notify"] = array(
@@ -1039,7 +1191,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" => ""),
@@ -1053,7 +1205,10 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "uid" => array("uid"),
+                                       "hash_uid" => array("hash", "uid"),
+                                       "seen_uid_date" => array("seen", "uid", "date"),
+                                       "uid_date" => array("uid", "date"),
+                                       "uid_type_link" => array("uid", "type", "link"),
                                        )
                        );
        $database["notify-threads"] = array(
@@ -1066,31 +1221,29 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "master-parent-item" => array("master-parent-item"),
-                                       "receiver-uid" => array("receiver-uid"),
                                        )
                        );
        $database["oembed"] = array(
                        "fields" => array(
-                                       "url" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"),
-                                       "content" => array("type" => "text"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "url" => array("type" => "varbinary(255)", "not null" => "1", "primary" => "1"),
+                                       "content" => array("type" => "mediumtext"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
-                                       "PRIMARY" => array("url".db_index_suffix($charset)),
+                                       "PRIMARY" => array("url"),
                                        "created" => array("created"),
                                        )
                        );
        $database["parsed_url"] = array(
                        "fields" => array(
-                                       "url" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"),
+                                       "url" => array("type" => "varbinary(255)", "not null" => "1", "primary" => "1"),
                                        "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" => "text"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "content" => array("type" => "mediumtext"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
-                                       "PRIMARY" => array("url".db_index_suffix($charset), "guessing", "oembed"),
+                                       "PRIMARY" => array("url", "guessing", "oembed"),
                                        "created" => array("created"),
                                        )
                        );
@@ -1098,13 +1251,13 @@ 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"),
-                                       "cat" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "k" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+                                       "cat" => array("type" => "varbinary(255)", "not null" => "1", "default" => ""),
+                                       "k" => array("type" => "varbinary(255)", "not null" => "1", "default" => ""),
                                        "v" => array("type" => "mediumtext"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "uid_cat_k" => array("UNIQUE", "uid","cat(30)","k(30)"),
+                                       "uid_cat_k" => array("UNIQUE", "uid", "cat", "k"),
                                        )
                        );
        $database["photo"] = array(
@@ -1114,8 +1267,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" => ""),
@@ -1136,25 +1289,25 @@ function db_definition($charset) {
                                        "PRIMARY" => array("id"),
                                        "uid_contactid" => array("uid", "contact-id"),
                                        "uid_profile" => array("uid", "profile"),
-                                       "uid_album_created" => array("uid", "album", "created"),
-                                       "resource-id" => array("resource-id"),
-                                       "guid" => array("guid"),
+                                       "uid_album_scale_created" => array("uid", "album(32)", "scale", "created"),
+                                       "uid_album_resource-id_created" => array("uid", "album(32)", "resource-id(64)", "created"),
+                                       "resource-id" => array("resource-id(64)"),
                                        )
                        );
        $database["poll"] = array(
                        "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"),
-                                       "q0" => array("type" => "mediumtext"),
-                                       "q1" => array("type" => "mediumtext"),
-                                       "q2" => array("type" => "mediumtext"),
-                                       "q3" => array("type" => "mediumtext"),
-                                       "q4" => array("type" => "mediumtext"),
-                                       "q5" => array("type" => "mediumtext"),
-                                       "q6" => array("type" => "mediumtext"),
-                                       "q7" => array("type" => "mediumtext"),
-                                       "q8" => array("type" => "mediumtext"),
-                                       "q9" => array("type" => "mediumtext"),
+                                       "q0" => array("type" => "text"),
+                                       "q1" => array("type" => "text"),
+                                       "q2" => array("type" => "text"),
+                                       "q3" => array("type" => "text"),
+                                       "q4" => array("type" => "text"),
+                                       "q5" => array("type" => "text"),
+                                       "q6" => array("type" => "text"),
+                                       "q7" => array("type" => "text"),
+                                       "q8" => array("type" => "text"),
+                                       "q9" => array("type" => "text"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -1176,8 +1329,8 @@ function db_definition($charset) {
        $database["process"] = array(
                        "fields" => array(
                                        "pid" => array("type" => "int(10) unsigned", "not null" => "1", "primary" => "1"),
-                                       "command" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "command" => array("type" => "varbinary(32)", "not null" => "1", "default" => ""),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("pid"),
@@ -1193,7 +1346,7 @@ function db_definition($charset) {
                                        "hide-friends" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "pdesc" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "dob" => array("type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00"),
+                                       "dob" => array("type" => "varchar(32)", "not null" => "1", "default" => "0001-01-01"),
                                        "address" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "locality" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "region" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1203,7 +1356,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" => ""),
@@ -1231,7 +1384,7 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "hometown" => array("hometown"),
+                                       "uid_is-default" => array("uid", "is-default"),
                                        )
                        );
        $database["profile_check"] = array(
@@ -1255,7 +1408,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(
@@ -1267,8 +1420,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"),
                                        ),
@@ -1285,7 +1438,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" => ""),
@@ -1304,19 +1457,18 @@ function db_definition($charset) {
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
                                        "uid" => array("uid"),
-                                       "term" => array("term"),
                                        )
                        );
        $database["session"] = array(
                        "fields" => array(
                                        "id" => array("type" => "bigint(20) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-                                       "sid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+                                       "sid" => array("type" => "varbinary(255)", "not null" => "1", "default" => ""),
                                        "data" => array("type" => "text"),
                                        "expire" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "sid" => array("sid"),
+                                       "sid" => array("sid(64)"),
                                        "expire" => array("expire"),
                                        )
                        );
@@ -1340,7 +1492,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"),
@@ -1359,8 +1511,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"),
@@ -1368,12 +1520,9 @@ function db_definition($charset) {
                        "indexes" => array(
                                        "PRIMARY" => array("tid"),
                                        "oid_otype_type_term" => array("oid","otype","type","term"),
-                                       "uid_term_tid" => array("uid","term","tid"),
-                                       "type_term" => array("type","term"),
-                                       "uid_otype_type_term_global_created" => array("uid","otype","type","term","global","created"),
-                                       "otype_type_term_tid" => array("otype","type","term","tid"),
-                                       "uid_otype_type_url" => array("uid","otype","type","url"),
-                                       "guid" => array("guid"),
+                                       "uid_otype_type_term_global_created" => array("uid","otype","type","term(32)","global","created"),
+                                       "uid_otype_type_url" => array("uid","otype","type","url(64)"),
+                                       "guid" => array("guid(64)"),
                                        )
                        );
        $database["thread"] = array(
@@ -1384,11 +1533,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"),
@@ -1407,17 +1556,13 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("iid"),
-                                       "created" => array("created"),
-                                       "commented" => array("commented"),
                                        "uid_network_commented" => array("uid","network","commented"),
                                        "uid_network_created" => array("uid","network","created"),
                                        "uid_contactid_commented" => array("uid","contact-id","commented"),
                                        "uid_contactid_created" => array("uid","contact-id","created"),
-                                       "uid_gcontactid_commented" => array("uid","gcontact-id","commented"),
-                                       "uid_gcontactid_created" => array("uid","gcontact-id","created"),
-                                       "wall_private_received" => array("wall","private","received"),
                                        "uid_created" => array("uid","created"),
                                        "uid_commented" => array("uid","commented"),
+                                       "uid_wall_created" => array("uid","wall","created"),
                                        )
                        );
        $database["tokens"] = array(
@@ -1444,8 +1589,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" => ""),
@@ -1469,8 +1614,8 @@ 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" => "mediumtext"),
@@ -1481,7 +1626,7 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("uid"),
-                                       "nickname" => array("nickname"),
+                                       "nickname" => array("nickname(32)"),
                                        )
                        );
        $database["userd"] = array(
@@ -1491,7 +1636,7 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "username" => array("username"),
+                                       "username" => array("username(32)"),
                                        )
                        );
        $database["workerqueue"] = array(
@@ -1499,13 +1644,12 @@ 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"),
-                                       "created" => array("created"),
                                        )
                        );
 
@@ -1556,9 +1700,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;
                }
        }
@@ -1573,9 +1715,6 @@ function dbstructure_run(&$argv, &$argc) {
        echo "dumpsql           dump database schema\n";
        return;
 
-
-
-
 }
 
 if (array_search(__file__,get_included_files())===0){