MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3132 from annando/1701-remove-duplicates

Browse source 
Adding unique indexes should now work with every MySQL flavour
This commit is contained in:
Tobias Diekershoff 2017-01-30 08:40:26 +01:00 committed by GitHub
parent 069dd5b75d 7ca809a00e
commit 0b04e0383c
1 changed files with 71 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
include/dbstructure.php
View file

@ -187,6 +187,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
// Compare it // Compare it
foreach ($definition AS $name => $structure) { foreach ($definition AS $name => $structure) {
$is_new_table = False; $is_new_table = False;
$group_by = "";
$sql3 = ""; $sql3 = "";
if (!isset($database[$name])) { if (!isset($database[$name])) {
$r = db_create_table($name, $structure["fields"], $charset, $verbose, $action, $structure['indexes']); $r = db_create_table($name, $structure["fields"], $charset, $verbose, $action, $structure['indexes']);
@ -208,10 +209,9 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
if ($current_index_definition != $new_index_definition) { if ($current_index_definition != $new_index_definition) {
if ($fieldnames[0] == "UNIQUE") { if ($fieldnames[0] == "UNIQUE") {
$is_unique = true; $is_unique = true;
// Deactivated. See below for the reason if ($ignore == "") {
//if ($ignore == "") { $temp_name = "temp-".$name;
// $temp_name = "temp-".$name; }
//}
} }
} }
} }
@ -278,6 +278,11 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
$new_index_definition = implode(",",$fieldnames); $new_index_definition = implode(",",$fieldnames);
if ($current_index_definition != $new_index_definition) { 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 ($sql2 != "") {
if ($sql3 == "") if ($sql3 == "")
$sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
@ -293,44 +298,38 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
if ($verbose) { if ($verbose) {
// Ensure index conversion to unique removes duplicates // Ensure index conversion to unique removes duplicates
if ($is_unique) { if ($is_unique) {
// By now the alternative is commented out. if ($ignore != "") {
// This is a preparation for the time when we found a good SQL routine.
//if ($ignore != "") {
echo "SET session old_alter_table=1;\n"; echo "SET session old_alter_table=1;\n";
//} else { } else {
// echo "CREATE TABLE `".$temp_name."` LIKE `".$name."`;\n"; echo "CREATE TABLE `".$temp_name."` LIKE `".$name."`;\n";
//} }
} }
echo $sql3."\n"; echo $sql3."\n";
if ($is_unique) { if ($is_unique) {
// By now the alternative is commented out. if ($ignore != "") {
// This is a preparation for the time when we found a good SQL routine.
//if ($ignore != "") {
echo "SET session old_alter_table=0;\n"; echo "SET session old_alter_table=0;\n";
//} else { } else {
// echo "INSERT IGNORE INTO `".$temp_name."` SELECT * FROM `".$name."`;\n"; echo "INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";\n";
// echo "DROP TABLE `".$name."`;\n"; echo "DROP TABLE `".$name."`;\n";
// echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n"; echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n";
//} }
} }
} }
if ($action) { if ($action) {
// Ensure index conversion to unique removes duplicates // Ensure index conversion to unique removes duplicates
if ($is_unique) { if ($is_unique) {
// By now the alternative is commented out. if ($ignore != "") {
// This is a preparation for the time when we found a good SQL routine.
//if ($ignore != "") {
$db->q("SET session old_alter_table=1;"); $db->q("SET session old_alter_table=1;");
//} else { } else {
// $r = $db->q("CREATE TABLE `".$temp_name."` LIKE `".$name."`;"); $r = $db->q("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
// if (!dbm::is_result($r)) { if (!dbm::is_result($r)) {
// $errors .= t('Errors encountered performing database changes.').$sql3.EOL; $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
// return $errors; return $errors;
// } }
//} }
} }
$r = @$db->q($sql3); $r = @$db->q($sql3);
@ -338,28 +337,25 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
$errors .= t('Errors encountered performing database changes.').$sql3.EOL; $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
if ($is_unique) { if ($is_unique) {
// By now the alternative is commented out. if ($ignore != "") {
// This is a preparation for the time when we found a good SQL routine.
//if ($ignore != "") {
$db->q("SET session old_alter_table=0;"); $db->q("SET session old_alter_table=0;");
//} else { } else {
// We have to check if "INSERT IGNORE" will work on newer MySQL versions $r = $db->q("INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";");
// $r = $db->q("INSERT IGNORE INTO `".$temp_name."` SELECT * FROM `".$name."`;"); if (!dbm::is_result($r)) {
// if (!dbm::is_result($r)) { $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
// $errors .= t('Errors encountered performing database changes.').$sql3.EOL; return $errors;
// return $errors; }
// } $r = $db->q("DROP TABLE `".$name."`;");
// $r = $db->q("DROP TABLE `".$name."`;"); if (!dbm::is_result($r)) {
// if (!dbm::is_result($r)) { $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
// $errors .= t('Errors encountered performing database changes.').$sql3.EOL; return $errors;
// return $errors; }
// } $r = $db->q("RENAME TABLE `".$temp_name."` TO `".$name."`;");
// $r = $db->q("RENAME TABLE `".$temp_name."` TO `".$name."`;"); if (!dbm::is_result($r)) {
// if (!dbm::is_result($r)) { $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
// $errors .= t('Errors encountered performing database changes.').$sql3.EOL; return $errors;
// return $errors; }
// } }
//}
} }
} }
} }
@ -477,6 +473,30 @@ function db_create_index($indexname, $fieldnames, $method="ADD") {
return($sql); 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) { function db_index_suffix($charset, $reduce = 0) {
if ($charset != "utf8mb4") { if ($charset != "utf8mb4") {
return ""; return "";