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');
+ }
+
$column = $index["Column_name"];
- if ($index["Sub_part"] != "")
+ // On utf8mb4 a varchar index can only have a length of 191
+ // 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")))
$column .= "(".$index["Sub_part"].")";
$indexdata[$index["Key_name"]][] = $column;
return(array("fields"=>$fielddata, "indexes"=>$indexdata));
}
-function print_structure($database) {
+function print_structure($database, $charset) {
echo "-- ------------------------------------------\n";
echo "-- ".FRIENDICA_PLATFORM." ".FRIENDICA_VERSION." (".FRIENDICA_CODENAME,")\n";
echo "-- DB_UPDATE_VERSION ".DB_UPDATE_VERSION."\n";
echo "--\n";
echo "-- TABLE $name\n";
echo "--\n";
- db_create_table($name, $structure['fields'], true, false, $structure["indexes"]);
+ db_create_table($name, $structure['fields'], $charset, true, false, $structure["indexes"]);
echo "\n";
}
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";
+
$errors = false;
logger('updating structure', LOGGER_DEBUG);
// Get the definition
if (is_null($definition))
- $definition = db_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);
+ // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
+ if (version_compare($db->getdb()->server_info, '5.7.4') >= 0) {
+ $ignore = '';
+ }else {
+ $ignore = ' IGNORE';
+ }
// Compare it
foreach ($definition AS $name => $structure) {
$is_new_table = False;
$sql3="";
if (!isset($database[$name])) {
- $r = db_create_table($name, $structure["fields"], $verbose, $action, $structure['indexes']);
+ $r = db_create_table($name, $structure["fields"], $charset, $verbose, $action, $structure['indexes']);
if(false === $r) {
$errors .= t('Errors encountered creating database tables.').$name.EOL;
}
$sql2=db_create_index($indexname, $fieldnames);
if ($sql2 != "") {
if ($sql3 == "")
- $sql3 = "ALTER TABLE `".$name."` ".$sql2;
+ $sql3 = "ALTER" . $ignore . " TABLE `".$name."` ".$sql2;
else
$sql3 .= ", ".$sql2;
}
}
}
+ if ($action)
+ set_config('system', 'maintenance', 0);
+
return $errors;
}
return($fieldstruct);
}
-function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
+function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=null) {
global $a, $db;
- if (isset($a->config["system"]["db_charset"]))
- $charset = $a->config["system"]["db_charset"];
- elseif ($verbose)
- $charset = "utf8mb4";
- else
- $charset = "utf8";
-
$r = true;
$sql = "";
killme();
}
-
- if ($indexname == "PRIMARY") {
- return sprintf("%s PRIMARY KEY(`%s`)", $method, implode("`,`", $fieldnames));
+ if ($fieldnames[0] == "UNIQUE") {
+ array_shift($fieldnames);
+ $method .= ' UNIQUE';
}
$names = "";
$names .= "`".dbesc($fieldname)."`";
}
+ if ($indexname == "PRIMARY") {
+ return sprintf("%s PRIMARY KEY(%s)", $method, $names);
+ }
+
$sql = sprintf("%s INDEX `%s` (%s)", $method, dbesc($indexname), $names);
return($sql);
}
-function db_definition() {
+function db_index_suffix($charset, $reduce = 0) {
+ if ($charset != "utf8mb4")
+ return "";
+
+ // On utf8mb4 indexes can only have a length of 191
+ $indexlength = 191 - $reduce;
+
+ return "(".$indexlength.")";
+}
+
+function db_definition($charset) {
$database = array();
"updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
- "PRIMARY" => array("k"),
+ "PRIMARY" => array("k".db_index_suffix($charset)),
"updated" => array("updated"),
)
);
),
"indexes" => array(
"PRIMARY" => array("id"),
- "cat_k" => array("cat(30)","k(30)"),
+ "cat_k" => array("UNIQUE", "cat(30)","k(30)"),
)
);
$database["contact"] = array(
"about" => array("type" => "text"),
"keywords" => array("type" => "text"),
"gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
+ "xmpp" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"attag" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"avatar" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"photo" => array("type" => "text"),
"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"),
"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"),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
- "PRIMARY" => array("url"),
+ "PRIMARY" => array("url".db_index_suffix($charset)),
"created" => array("created"),
)
);
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
- "PRIMARY" => array("url", "guessing", "oembed"),
+ "PRIMARY" => array("url".db_index_suffix($charset), "guessing", "oembed"),
"created" => array("created"),
)
);
),
"indexes" => array(
"PRIMARY" => array("id"),
- "uid_cat_k" => array("uid","cat(30)","k(30)"),
+ "uid_cat_k" => array("UNIQUE", "uid","cat(30)","k(30)"),
)
);
$database["photo"] = array(
"education" => array("type" => "text"),
"contact" => array("type" => "text"),
"homepage" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "xmpp" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"thumb" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"publish" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"cntunkmail" => array("type" => "int(11)", "not null" => "1", "default" => "10"),
"notify-flags" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "65535"),
"page-flags" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
+ "account-type" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
"prvnets" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"pwdreset" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"maxreq" => array("type" => "int(11)", "not null" => "1", "default" => "10"),
if ($argc==2) {
switch ($argv[1]) {
+ case "dryrun":
+ update_structure(true, false);
+ return;
case "update":
update_structure(true, true);
set_config('system','build',DB_UPDATE_VERSION);
return;
case "dumpsql":
- print_structure(db_definition());
+ // For the dump that is used to create the database.sql we always assume utfmb4
+ $charset = "utf8mb4";
+ print_structure(db_definition($charset), $charset);
return;
}
}
// print help
echo $argv[0]." <command>\n";
echo "\n";
- echo "commands:\n";
+ echo "Commands:\n";
+ echo "dryrun show database update schema queries without running them\n";
echo "update update database schema\n";
echo "dumpsql dump database schema\n";
return;