From 63b4d84ea9078a5ec9b6ec1bb48c77cd84abe90b Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 11 Dec 2017 21:53:52 +0000 Subject: [PATCH] Fix for duplicate removal in the database structure check --- include/dbstructure.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dbstructure.php b/include/dbstructure.php index dae54835f0..5e60d38b5f 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -385,7 +385,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $field_list = ''; if ($is_unique && $ignore == '') { - foreach ($structure['fields'] AS $fieldname => $parameters) { + foreach ($database[$name]["fields"] AS $fieldname => $parameters) { $field_list .= 'ANY_VALUE(`' . $fieldname . '`),'; } $field_list = rtrim($field_list, ','); @@ -408,7 +408,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { if ($ignore != "") { echo "SET session old_alter_table=0;\n"; } else { - echo "INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";\n"; + echo "INSERT INTO `".$temp_name."` SELECT ".dba::any_value_fallback($field_list)." FROM `".$name."`".$group_by.";\n"; echo "DROP TABLE `".$name."`;\n"; echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n"; }