From fbae421e47956c9fb94fc09462e08beeb06911b3 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sun, 7 Dec 2008 19:01:46 +0000 Subject: [PATCH] Fixed error handling during upgrade. --- admin/db/maintenance_db.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc index d5124981..ff7db9ca 100644 --- a/admin/db/maintenance_db.inc +++ b/admin/db/maintenance_db.inc @@ -125,6 +125,7 @@ function db_import($filename, $connection, $force=true) "drop table if exists" => 'drop_queries'); $ignored_mysql_errors = array( //errors ignored in normal (non forced) mode '1022', // duplicate key + '1050', // Table %s already exists '1060', // duplicate column name '1061', // duplicate key name '1062', // duplicate key entry @@ -196,7 +197,7 @@ function db_import($filename, $connection, $force=true) if (!db_query($drop_query[0])) { if (!in_array(db_error_no(), $ignored_mysql_errors)) - $sql_errors[] = array(db_error_no().':'.db_error_msg($db), $drop_query[1]); + $sql_errors[] = array(db_error_msg($db), $drop_query[1]); } } } @@ -207,9 +208,10 @@ function db_import($filename, $connection, $force=true) foreach($table_queries as $table_query) { if (!db_query($table_query[0])) - { - if (!$force || !in_array(db_error_no(), $ignored_mysql_errors)) + { + if (!$force && !in_array(db_error_no(), $ignored_mysql_errors)) { $sql_errors[] = array(db_error_msg($db), $table_query[1]); + } } } } @@ -221,7 +223,7 @@ function db_import($filename, $connection, $force=true) { if (!db_query($data_query[0])) { - if (!$force || !in_array(db_error_no(),$ignored_mysql_errors)) + if (!$force && !in_array(db_error_no(),$ignored_mysql_errors)) $sql_errors[] = array(db_error_msg($db), $data_query[1]); } } -- 2.30.2