Merge pull request #3190 from annando/bugfix-dbstructure

Bugfix: "ALTER IGNORE" was missing on structure and index alteration
This commit is contained in:
Tobias Diekershoff 2017-02-26 10:05:02 +01:00 gecommit door GitHub
bovenliggende b850eb248a 6bd59cd094
commit 86c6c48bd8
1 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen

Bestand weergeven

@ -242,7 +242,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
if (!isset($database[$name]["fields"][$fieldname])) {
$sql2=db_add_table_field($fieldname, $parameters);
if ($sql3 == "") {
$sql3 = "ALTER TABLE `".$temp_name."` ".$sql2;
$sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
} else {
$sql3 .= ", ".$sql2;
}
@ -253,7 +253,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
if ($current_field_definition != $new_field_definition) {
$sql2=db_modify_table_field($fieldname, $parameters);
if ($sql3 == "") {
$sql3 = "ALTER TABLE `".$temp_name."` ".$sql2;
$sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
} else {
$sql3 .= ", ".$sql2;
}