X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=admin%2Fdb%2Fmaintenance_db.inc;h=a6d2ee80ce44c52819885421fe68912cec79cc11;hb=a5242af68e65661edb7175412444dce536a7f311;hp=444ac100d2f3cc72b0f32f2827dab98578e9742f;hpb=5928cc0bb4164cfd1dfc77f279f6b12d7806294f;p=fa-stable.git diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc index 444ac100..a6d2ee80 100644 --- a/admin/db/maintenance_db.inc +++ b/admin/db/maintenance_db.inc @@ -1,4 +1,14 @@ . +***********************************************************************/ function write_config_db($new = false) { @@ -82,6 +92,7 @@ function db_create_db($connection) function db_drop_db($connection) { + if ($connection["tbpref"] == "") { $sql = "DROP DATABASE " . $connection["dbname"] . ""; @@ -104,11 +115,30 @@ function db_drop_db($connection) } } -function db_import($filename, $connection) +function db_import($filename, $connection, $force=true) { + global $db; + $allowed_commands = array( + "create" => 'table_queries', + "alter table" => 'table_queries', + "insert" => 'data_queries', + "update" => 'data_queries', + "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 + '1091' // can't drop key/column check if exists + ); $data_queries = array(); $drop_queries = array(); $table_queries = array(); + $sql_errors = array(); + + ini_set("max_execution_time", "180"); + db_query("SET foreign_key_checks=0"); // uncrompress gziped backup files if (strpos($filename, ".gzip") || strpos($filename, ".GZIP")) @@ -118,74 +148,59 @@ function db_import($filename, $connection) else $lines = file("". $filename); - // divide insert and create sql queries - // $table is set to TRUE if the next line belongs to a create sql query - $table = false; - foreach($lines as $line) + // parse input file + $query_table = ''; + foreach($lines as $line_no => $line) { $line = trim($line); - + $line = str_replace("0_", $connection["tbpref"], $line); - // $line = str_replace("Y_", "0_", $line); - // the last line did not belong to a 'create' sql query - if (!$table) - { - - // this line does not, too - if (strtolower(substr($line,0,6)) == "insert") - { - $data_queries[] = substr($line, 0, strlen($line) - 1); - // this line does not, too - } - elseif (strtolower(substr($line,0,6)) == "update") - { - $data_queries[] = substr($line, 0, strlen($line) - 1); - - // this line does not, too - } - elseif (strtolower(substr($line, 0, 20)) == "drop table if exists") + if ($query_table == '') + { // check if line begins with one of allowed queries + foreach($allowed_commands as $cmd => $table) { - $drop_queries[] = substr($line, 0, strlen($line) - 1); - - // this line does! - } - elseif (strtolower(substr($line, 0, 6)) == "create") - { - $table = true; - $table_queries[] = $line . "\n"; - } - elseif (strtolower(substr($line, 0, 11)) == "alter table") + if (strtolower(substr($line, 0, strlen($cmd))) == $cmd) + { + $query_table = $table; + if (strstr(strtolower($line), ' drop column ')) + $query_table = 'drop_queries'; + ${$query_table}[] = array('', $line_no+1); + break; + } + } + } + if($query_table != '') // inside allowed query + { + $table = $query_table; + if (substr($line, -1) == ';') // end of query found { - $data_queries[] = substr($line, 0, strlen($line) - 1); + $line = substr($line, 0, strlen($line) - 1); // strip ';' + $query_table = ''; } - - // the current line belongs to a create sql query - } - else - { - - // create sql query ending in this line - if (strtolower(substr($line, 0, 1)) == ")") { - $table = false; - $line = substr($line,0,strlen($line)-1); - } - $table_queries[count($table_queries) - 1] .= $line . "\n"; + ${$table}[count(${$table}) - 1][0] .= $line . "\n"; } + } - - $sql_error = false; - +/* + { // for debugging purposes + global $path_to_root; + $f = fopen($path_to_root.'/tmp/dbimport.txt', 'w+'); + fwrite($f, print_r($drop_queries,true) ."\n"); + fwrite($f, print_r($table_queries,true) ."\n"); + fwrite($f, print_r($data_queries,true)); + fclose($f); + } +*/ // execute drop tables if exists queries - if (is_array($drop_queries)) + if ($force && is_array($drop_queries)) { foreach($drop_queries as $drop_query) { - $sql_error = false; - if (!db_query($drop_query)) + if (!db_query($drop_query[0])) { - $sql_error = true; - //if ($CONF['import_error']) echo nl2br($drop_query)."\n