Removed company custom fields, added default delivery required by

[fa-stable.git] / admin / db / maintenance_db.inc

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 1d9a027380273950d44cb58f32aa6ba175f6c2fe..44ba4bb95f458bda1dbe0ec91794e17728e62bf0 100644 (file)
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -1,14 +1,15 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
+       Released under the terms of the GNU General Public License,
+       GPL, as published by the Free Software Foundation, either version 
        3 of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+
 function write_config_db($new = false)
 {
        global $path_to_root, $def_coy, $db_connections, $tb_pref_counter;
@@ -137,6 +138,8 @@ function db_import($filename, $connection, $force=true)
        $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"))
                $lines = db_ungzip("lines", $filename);
@@ -160,8 +163,6 @@ function db_import($filename, $connection, $force=true)
                                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;
                                }
@@ -209,7 +210,7 @@ function db_import($filename, $connection, $force=true)
                {
                        if (!db_query($table_query[0]))
                        {       
-                               if (!$force && !in_array(db_error_no(), $ignored_mysql_errors)) {
+                               if (!in_array(db_error_no(), $ignored_mysql_errors) || !$force) {
                                        $sql_errors[] = array(db_error_msg($db), $table_query[1]);
                                }
                        }
@@ -223,12 +224,14 @@ function db_import($filename, $connection, $force=true)
                {
                        if (!db_query($data_query[0]))
                        {
-                               if (!$force && !in_array(db_error_no(),$ignored_mysql_errors))
+                               if (!in_array(db_error_no(),$ignored_mysql_errors) || !$force)
                                        $sql_errors[] = array(db_error_msg($db), $data_query[1]);
                        }
                }
        }
        
+       db_query("SET foreign_key_checks=1");
+
        if (count($sql_errors)) {
                // display first failure message; the rest are probably derivative 
                $err = $sql_errors[0];