0001767: Company Creation assigning externally created database + Fix

[fa-stable.git] / includes / db / connect_db.inc

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index ed706fe31401ef82b8f1b15215551c51bd47a243..b0c33f6489c30f2fbf18368a822cfc0bd0027d41 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -36,7 +36,7 @@ $db_duplicate_error_code = 1062;
 function db_query($sql, $err_msg=null)
 {
        global $db, $show_sql, $sql_trail, $select_trail, $go_debug, $sql_queries, $Ajax,
-               $db_connections;
+               $db_connections, $db_last_inserted_id;
        
        // set current db prefix
        $cur_prefix = $db_connections[$_SESSION["wa_current_user"]->cur_con]['tbpref'];
@@ -49,7 +49,9 @@ function db_query($sql, $err_msg=null)
        }
 
        $result = mysql_query($sql, $db);
+       
        if($sql_trail) {
+               $db_last_inserted_id = mysql_insert_id($db);    // preserve in case trail insert is done
                if ($select_trail || (strstr($sql, 'SELECT') === false)) {
                        mysql_query(
                        "INSERT INTO ".$cur_prefix."sql_trail
@@ -150,8 +152,9 @@ function db_error_msg($conn)
 
 function db_insert_id()
 {
-       global $db;
-       return mysql_insert_id($db);
+       global $db_last_inserted_id, $sql_trail, $db;
+
+       return $sql_trail ? $db_last_inserted_id : mysql_insert_id($db);
 }
 
 function db_num_affected_rows()
@@ -171,7 +174,7 @@ function db_create_db($connection)
                $connection["dbuser"], $connection["dbpassword"]);
        if (!mysql_select_db($connection["dbname"], $db))
        {
-               $sql = "CREATE DATABASE " . $connection["dbname"] . "";
+               $sql = "CREATE DATABASE IF NOT EXISTS " . $connection["dbname"] . "";
                if (!mysql_query($sql) || !mysql_select_db($connection["dbname"], $db))
                        return 0;
        }
@@ -183,7 +186,7 @@ function db_drop_db($connection)
 
        if ($connection["tbpref"] == "")
        {
-               $sql = "DROP DATABASE " . $connection["dbname"] . "";
+               $sql = "DROP DATABASE IF EXISTS " . $connection["dbname"] . "";
                return mysql_query($sql);
        }
        else