X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fmaintenance_db.inc;h=d5124981594d41cecb485ae6b5f0215d9d737d41;hb=b17df731b4bb055c2fdd568bc4be9e5caa0ee07b;hp=840b493b068232282b46ba44b0b10a5f11044a15;hpb=1b77725d52b62a154ef2ea579621ba7a02178996;p=fa-stable.git diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc index 840b493b..d5124981 100644 --- a/admin/db/maintenance_db.inc +++ b/admin/db/maintenance_db.inc @@ -1,5 +1,14 @@ . +***********************************************************************/ function write_config_db($new = false) { global $path_to_root, $def_coy, $db_connections, $tb_pref_counter; @@ -82,6 +91,7 @@ function db_create_db($connection) function db_drop_db($connection) { + if ($connection["tbpref"] == "") { $sql = "DROP DATABASE " . $connection["dbname"] . ""; @@ -96,7 +106,7 @@ function db_drop_db($connection) // get table structures foreach ($all_tables as $table) { - if (strpos($table['Name'], $connection["tbpref"]) !== false) + if (strpos($table['Name'], $connection["tbpref"]) === 0) db_query("DROP TABLE `".$table['Name'] . "`"); } //deleting the tables, how?? @@ -104,12 +114,28 @@ 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 + '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"); // uncrompress gziped backup files if (strpos($filename, ".gzip") || strpos($filename, ".GZIP")) $lines = db_ungzip("lines", $filename); @@ -118,62 +144,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, 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") + 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 { - $table = true; - $table_queries[] = $line . "\n"; + $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; - $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
".mysql_error()."

\n"; + if (!in_array(db_error_no(), $ignored_mysql_errors)) + $sql_errors[] = array(db_error_no().':'.db_error_msg($db), $drop_query[1]); } } } @@ -183,11 +206,10 @@ function db_import($filename, $connection) { foreach($table_queries as $table_query) { - $sql_error = false; - if (!db_query($table_query)) + if (!db_query($table_query[0])) { - $sql_error = true; - //if ($CONF['import_error']) echo nl2br($table_query)."\n
".mysql_error()."

\n"; + if (!$force || !in_array(db_error_no(), $ignored_mysql_errors)) + $sql_errors[] = array(db_error_msg($db), $table_query[1]); } } } @@ -197,22 +219,22 @@ function db_import($filename, $connection) { foreach($data_queries as $data_query) { - $sql_error = false; - if (!db_query($data_query)) + if (!db_query($data_query[0])) { - //if ($CONF['import_error']) echo $data_query."\n
".mysql_error()."

\n"; - $sql_error = true; + if (!$force || !in_array(db_error_no(),$ignored_mysql_errors)) + $sql_errors[] = array(db_error_msg($db), $data_query[1]); } } } - - // show number successful executed querys or if an error did occur - if ($sql_error == 1) + + if (count($sql_errors)) { + // display first failure message; the rest are probably derivative + $err = $sql_errors[0]; + display_error(sprintf(_("SQL script execution failed in line %d: %s"), + $err[1], $err[0])); return false; - //echo "
".IM_ERROR.".
\n"; - else + } else return true; - //echo "
".IM_SUCCESS." ".count($table_queries)." ".IM_TABLES." ".count($data_queries)." ".IM_ROWS." (".$import_file.")
\n"; //$shell_command = C_MYSQL_PATH . " -h $host -u $user -p{$password} $dbname < $filename"; //shell_exec($shell_command); } @@ -274,13 +296,12 @@ function db_unzip($mode, $path) // generates a dump of $db database // $drop and $zip tell if to include the drop table statement or dry to pack -function db_export($conn, $filename, $zip='no', $comment='') +function db_export($conn, $filename, $zip='no', $comment='', $tbpref = TB_PREF) { global $app_title, $version, $power_url, $path_to_root; $error = false; - // set max string size before writing to file $max_size = 1048576 * 2; // 2 MB // changes max size if value can be retrieved @@ -294,13 +315,14 @@ function db_export($conn, $filename, $zip='no', $comment='') $backupfile = $filename . ".zip"; else $backupfile = $filename; - $company = get_company_pref('coy_name'); + $company = get_company_pref('coy_name', $tbpref); + //create comment $out="# MySQL dump of database '".$conn["dbname"]."' on host '".$conn["host"]."'\n"; $out.="# Backup Date and Time: ".date("Y-m-d H:i")."\n"; $out.="# Built by " . $app_title . " " . $version ."\n"; $out.="# ".$power_url."\n"; - $out.="# Company: ".$company."\n"; + $out.="# Company: ". @html_entity_decode($company, ENT_COMPAT, $_SESSION['language']->encoding)."\n"; $out.="# User: ".$_SESSION["wa_current_user"]->name."\n\n"; // write users comment @@ -321,7 +343,9 @@ function db_export($conn, $filename, $zip='no', $comment='') $all_tables = array(); while($row = db_fetch($res)) { - if ($conn["tbpref"] == "" || strpos($row['Name'], $conn["tbpref"]) !== false) + //if ($conn["tbpref"] == "" || strpos($row['Name'], $conn["tbpref"]) !== false) replaced + if (($conn["tbpref"] == "" && !preg_match('/[0-9]+_/', $row['Name'])) || + ($conn["tbpref"] != "" && strpos($row['Name'], $conn["tbpref"]) !== false)) $all_tables[] = $row; } // get table structures @@ -396,11 +420,7 @@ function db_export($conn, $filename, $zip='no', $comment='') // run through each field for ($k = 0; $k < $nf = db_num_fields($res2); $k++) { - // identify null values and save them as null instead of '' - if ($field_type[$k] != "" && $field_type[$k] != "NO" && $row2[$k] == "") - $out .= "NULL"; - else - $out .= "'" . db_escape($row2[$k]) . "'"; + $out .= db_escape(@html_entity_decode($row2[$k], ENT_COMPAT, $_SESSION['language']->encoding)); if ($k < ($nf - 1)) $out .= ", "; } @@ -420,7 +440,7 @@ function db_export($conn, $filename, $zip='no', $comment='') } elseif ($error) { - @unlink($path_to_root . BACKUP_PATH . $backupfile); + @unlink(BACKUP_PATH . $backupfile); return false; } @@ -438,7 +458,7 @@ function db_export($conn, $filename, $zip='no', $comment='') } else { - @unlink($path_to_root . BACKUP_PATH . $backupfile); + @unlink(BACKUP_PATH . $backupfile); return false; } @@ -453,7 +473,7 @@ function db_export($conn, $filename, $zip='no', $comment='') } else { - @unlink($path_to_root . BACKUP_PATH . $backupfile); + @unlink(BACKUP_PATH . $backupfile); return false; } return $backupfile; @@ -516,7 +536,7 @@ function save_to_file($backupfile, $zip, $fileData) if ($zip == "gzip") { - if ($zp = @gzopen($path_to_root . BACKUP_PATH . $backupfile, "a9")) + if ($zp = @gzopen(BACKUP_PATH . $backupfile, "a9")) { @gzwrite($zp, $fileData); @gzclose($zp); @@ -592,7 +612,7 @@ function save_to_file($backupfile, $zip, $fileData) // total # of entries "on this disk", total # of entries overall, size of central dir, offset to start of central dir, .zip file comment length $fileData .= pack('v', 1) . pack('v', 1) . pack('V', strlen($cdrec)) . pack('V', strlen($fr)) . "\x00\x00"; - if ($zp = @fopen($path_to_root . BACKUP_PATH . $backupfile, "a")) + if ($zp = @fopen(BACKUP_PATH . $backupfile, "a")) { @fwrite($zp, $fileData); @fclose($zp); @@ -607,7 +627,7 @@ function save_to_file($backupfile, $zip, $fileData) } else { - if ($zp = @fopen($path_to_root . BACKUP_PATH . $backupfile, "a")) + if ($zp = @fopen(BACKUP_PATH . $backupfile, "a")) { @fwrite($zp, $fileData); @fclose($zp);