From 1d6fd8e1352d9ed4bfe3f91e9f2bf254920eb479 Mon Sep 17 00:00:00 2001 From: David M Date: Mon, 19 Feb 2007 04:12:13 +0000 Subject: - clean up mssql and mssql_odbc, mssql now uses a different method of dealing with IDENTITY - clean up firebird, I will consider changing it to use fetch array instead of fetch object. it's identity code already uses this method as of right... now :D - fix a tiny bug in MySQL's driver (remember to pass the connect id to all DBAL functions) - add new_link as a new param for sql_connect. This allows you to make connections that are not dependant on each other. This is done for our friends mysql, mssql, postgresql and oracle. Now for everybody else.. (I said this was clever ;) MySQLi and SQLite should always spawn a new connection when you call it while mssql_odbc and firebird both will create new links if you give them different params (different creds) than the previous connection(s). Thus we can always promise new links :D - fixed a bug in the converter - cleaned up the dbal a little git-svn-id: file:///svn/phpbb/trunk@7009 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/install_convert.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'phpBB/install/install_convert.php') diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 9b7e621397..ffbb4e4ef7 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -126,7 +126,7 @@ class install_convert extends module require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); $db = new $sql_db(); - $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false); + $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true); unset($dbpasswd); // We need to fill the config to let internal functions correctly work @@ -222,7 +222,7 @@ class install_convert extends module require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); $db = new $sql_db(); - $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false); + $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true); unset($dbpasswd); switch ($db->sql_layer) @@ -331,7 +331,7 @@ class install_convert extends module require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); $db = new $sql_db(); - $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false); + $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true); unset($dbpasswd); $this->page_title = $lang['STAGE_SETTINGS']; @@ -427,7 +427,7 @@ class install_convert extends module { $sql_db = 'dbal_' . $src_dbms; $src_db = new $sql_db(); - $src_db->sql_connect($src_dbhost, $src_dbuser, $src_dbpasswd, $src_dbname, $src_dbport, false); + $src_db->sql_connect($src_dbhost, $src_dbuser, $src_dbpasswd, $src_dbname, $src_dbport, false, true); $same_db = false; } else @@ -466,7 +466,7 @@ class install_convert extends module compare_table($tables, $tablename, $prefixes); } } - $src_->sql_freeresult($result); + $src_db->sql_freeresult($result); } foreach ($prefixes as $prefix => $count) @@ -591,7 +591,7 @@ class install_convert extends module require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); $db = new $sql_db(); - $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false); + $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true); unset($dbpasswd); $sql = 'SELECT * @@ -663,7 +663,7 @@ class install_convert extends module } $sql_db = 'dbal_' . $convert->src_dbms; $src_db = new $sql_db(); - $src_db->sql_connect($convert->src_dbhost, $convert->src_dbuser, $convert->src_dbpasswd, $convert->src_dbname, $convert->src_dbport, false); + $src_db->sql_connect($convert->src_dbhost, $convert->src_dbuser, $convert->src_dbpasswd, $convert->src_dbname, $convert->src_dbport, false, true); $same_db = false; } else -- cgit v1.2.1