// 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']);
if (!dbm::is_result($r)) {
if ($current_index_definition != $new_index_definition) {
if ($fieldnames[0] == "UNIQUE") {
$is_unique = true;
- // Deactivated. See below for the reason
- //if ($ignore == "") {
- // $temp_name = "temp-".$name;
- //}
+ if ($ignore == "") {
+ $temp_name = "temp-".$name;
+ }
}
}
}
}
$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 `".$temp_name."` ".$sql2;
if ($verbose) {
// Ensure index conversion to unique removes duplicates
if ($is_unique) {
- // By now the alternative is commented out.
- // This is a preparation for the time when we found a good SQL routine.
- //if ($ignore != "") {
+ if ($ignore != "") {
echo "SET session old_alter_table=1;\n";
- //} else {
- // echo "CREATE TABLE `".$temp_name."` LIKE `".$name."`;\n";
- //}
+ } else {
+ echo "CREATE TABLE `".$temp_name."` LIKE `".$name."`;\n";
+ }
}
echo $sql3."\n";
if ($is_unique) {
- // By now the alternative is commented out.
- // This is a preparation for the time when we found a good SQL routine.
- //if ($ignore != "") {
+ if ($ignore != "") {
echo "SET session old_alter_table=0;\n";
- //} else {
- // echo "INSERT IGNORE INTO `".$temp_name."` SELECT * FROM `".$name."`;\n";
- // echo "DROP TABLE `".$name."`;\n";
- // echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n";
- //}
+ } else {
+ echo "INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";\n";
+ echo "DROP TABLE `".$name."`;\n";
+ echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n";
+ }
}
}
if ($action) {
// Ensure index conversion to unique removes duplicates
if ($is_unique) {
- // By now the alternative is commented out.
- // This is a preparation for the time when we found a good SQL routine.
- //if ($ignore != "") {
+ if ($ignore != "") {
$db->q("SET session old_alter_table=1;");
- //} else {
- // $r = $db->q("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
- // if (!dbm::is_result($r)) {
- // $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
- // return $errors;
- // }
- //}
+ } else {
+ $r = $db->q("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
+ if (!dbm::is_result($r)) {
+ $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
+ return $errors;
+ }
+ }
}
$r = @$db->q($sql3);
$errors .= t('Errors encountered performing database changes.').$sql3.EOL;
if ($is_unique) {
- // By now the alternative is commented out.
- // This is a preparation for the time when we found a good SQL routine.
- //if ($ignore != "") {
+ if ($ignore != "") {
$db->q("SET session old_alter_table=0;");
- //} else {
- // We have to check if "INSERT IGNORE" will work on newer MySQL versions
- // $r = $db->q("INSERT IGNORE INTO `".$temp_name."` SELECT * FROM `".$name."`;");
- // if (!dbm::is_result($r)) {
- // $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
- // return $errors;
- // }
- // $r = $db->q("DROP TABLE `".$name."`;");
- // if (!dbm::is_result($r)) {
- // $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
- // return $errors;
- // }
- // $r = $db->q("RENAME TABLE `".$temp_name."` TO `".$name."`;");
- // if (!dbm::is_result($r)) {
- // $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
- // return $errors;
- // }
- //}
+ } else {
+ $r = $db->q("INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";");
+ if (!dbm::is_result($r)) {
+ $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
+ return $errors;
+ }
+ $r = $db->q("DROP TABLE `".$name."`;");
+ if (!dbm::is_result($r)) {
+ $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
+ return $errors;
+ }
+ $r = $db->q("RENAME TABLE `".$temp_name."` TO `".$name."`;");
+ if (!dbm::is_result($r)) {
+ $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
+ return $errors;
+ }
+ }
}
}
}
return($sql);
}
+function db_group_by($indexname, $fieldnames) {
+
+ if ($fieldnames[0] != "UNIQUE") {
+ return "";
+ }
+
+ array_shift($fieldnames);
+
+ $names = "";
+ foreach ($fieldnames AS $fieldname) {
+ if ($names != "")
+ $names .= ",";
+
+ if (preg_match('|(.+)\((\d+)\)|', $fieldname, $matches)) {
+ $names .= "`".dbesc($matches[1])."`";
+ } else {
+ $names .= "`".dbesc($fieldname)."`";
+ }
+ }
+
+ $sql = sprintf(" GROUP BY %s", $names);
+ return $sql;
+}
+
function db_index_suffix($charset, $reduce = 0) {
if ($charset != "utf8mb4") {
return "";
$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"),
),
"indexes" => array(
"PRIMARY" => array("id"),
+ "name" => array("UNIQUE", "name"),
)
);
$database["attach"] = array(
"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"),
"allow_cid" => array("type" => "mediumtext"),
- "allow_gid" => array("type" => "medium_text"),
- "deny_cid" => array("type" => "medium_text"),
- "deny_gid" => array("type" => "medium_text"),
+ "allow_gid" => array("type" => "mediumtext"),
+ "deny_cid" => array("type" => "mediumtext"),
+ "deny_gid" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
"nofinish" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"adjust" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
"ignore" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
- "allow_cid" => array("type" => "medium_text"),
- "allow_gid" => array("type" => "medium_text"),
- "deny_cid" => array("type" => "medium_text"),
- "deny_gid" => array("type" => "medium_text"),
+ "allow_cid" => array("type" => "mediumtext"),
+ "allow_gid" => array("type" => "mediumtext"),
+ "deny_cid" => array("type" => "mediumtext"),
+ "deny_gid" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
),
"indexes" => array(
"PRIMARY" => array("id"),
- "nurl" => array("nurl(32)"),
- "name" => array("name(32)"),
+ "nurl" => array("nurl(64)"),
+ "name" => array("name(64)"),
"nick" => array("nick(32)"),
- "addr" => array("addr(32)"),
+ "addr" => array("addr(64)"),
"hide_network_updated" => array("hide", "network", "updated"),
"updated" => array("updated"),
)
),
"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(
"expire_notification_sent" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"service_class" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"def_gid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
- "allow_cid" => array("type" => "medium_text"),
- "allow_gid" => array("type" => "medium_text"),
- "deny_cid" => array("type" => "medium_text"),
- "deny_gid" => array("type" => "medium_text"),
+ "allow_cid" => array("type" => "mediumtext"),
+ "allow_gid" => array("type" => "mediumtext"),
+ "deny_cid" => array("type" => "mediumtext"),
+ "deny_gid" => array("type" => "mediumtext"),
"openidserver" => array("type" => "text"),
),
"indexes" => array(
projects / friendica.git / blobdiff