X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db.inc;h=fda58ab32e1863a95b739bd74f52a1cb1f861d73;hb=7840540918bfd37c886877a5d52e3ba0b3373289;hp=1e6c2c4a099d2913cc8ce2fe4ff166b9796cdab0;hpb=7e994a8e658a7660dad5a4cd0c24fb8d174cc937;p=fa-stable.git

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index 1e6c2c4a..fda58ab3 100644
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -12,13 +12,20 @@
 
 function set_global_connection($company=-1)
 {
-	global $db, $transaction_level;
+	global $db, $transaction_level, $db_connections;
 
 	cancel_transaction(); // cancel all aborted transactions if any
 	$transaction_level = 0;
 
-   	$db = $_SESSION["wa_current_user"]->get_db_connection($company);
+	if ($company == -1) 
+		$company = $_SESSION["wa_current_user"]->company;
 
+	$_SESSION["wa_current_user"]->cur_con = $company;
+
+	$connection = $db_connections[$company];
+
+	$db = mysql_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"]);
+		mysql_select_db($connection["dbname"], $db);
 	return $db;
 }
 
@@ -29,8 +36,8 @@ $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'];
 	$sql = str_replace(TB_PREF, $cur_prefix, $sql);
@@ -42,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
@@ -143,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()
@@ -153,4 +163,56 @@ function db_num_affected_rows()
 	return mysql_affected_rows($db);
 }
 
-?>
+function db_field_name($result, $n)
+{
+	return mysql_field_name($result, $n);
+}
+
+function db_create_db($connection)
+{
+	$db = mysql_connect($connection["host"] ,
+		$connection["dbuser"], $connection["dbpassword"]);
+	if (!mysql_select_db($connection["dbname"], $db))
+	{
+		$sql = "CREATE DATABASE " . $connection["dbname"] . "";
+		if (!mysql_query($sql) || !mysql_select_db($connection["dbname"], $db))
+			return 0;
+	}
+	return $db;
+}
+
+function db_drop_db($connection)
+{
+
+	if ($connection["tbpref"] == "")
+	{
+		$sql = "DROP DATABASE " . $connection["dbname"] . "";
+		return mysql_query($sql);
+	}
+	else
+	{
+    	$res = db_query("show table status");
+    	$all_tables = array();
+    	while($row = db_fetch($res))
+    		$all_tables[] = $row;
+        // get table structures
+		foreach ($all_tables as $table)
+		{
+			if (strpos($table['Name'], $connection["tbpref"]) === 0)
+				db_query("DROP TABLE `".$table['Name'] . "`");
+		}
+		//deleting the tables, how??
+		return true;
+	}
+}
+
+function db_close($dbase = null)
+{
+	global $db;
+	
+	if (!$dbase)
+		$dbase = $db;
+	return mysql_close($dbase);
+}
+
+?>
\ No newline at end of file