diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-07-04 21:08:20 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-07-04 21:08:20 +0200 |
| commit | 53ff23671c2706c13bbe8ecca6b29b3c3456768b (patch) | |
| tree | 9c53dc59698da5b4750e536f20552ffe088931c3 /phpBB/install/install_convert.php | |
| parent | 86e21a9b261d6239487c626b7e9c9f462ceab611 (diff) | |
| parent | ff6e026a403a622bd1aa498bff396a737735faed (diff) | |
| download | forums-53ff23671c2706c13bbe8ecca6b29b3c3456768b.tar forums-53ff23671c2706c13bbe8ecca6b29b3c3456768b.tar.gz forums-53ff23671c2706c13bbe8ecca6b29b3c3456768b.tar.bz2 forums-53ff23671c2706c13bbe8ecca6b29b3c3456768b.tar.xz forums-53ff23671c2706c13bbe8ecca6b29b3c3456768b.zip | |
Merge remote-tracking branch 'github-nicofuma/ticket/12446' into develop-ascraeus
* github-nicofuma/ticket/12446:
[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
Diffstat (limited to 'phpBB/install/install_convert.php')
| -rw-r--r-- | phpBB/install/install_convert.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index a0d5e802e6..6109f5e28b 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -248,7 +248,7 @@ class install_convert extends module )); } - switch ($db->sql_layer) + switch ($db->get_sql_layer()) { case 'sqlite': case 'sqlite3': @@ -727,7 +727,7 @@ class install_convert extends module $src_db->sql_query("SET NAMES 'binary'"); } - switch ($db->sql_layer) + switch ($db->get_sql_layer()) { case 'sqlite': case 'sqlite3': @@ -1129,7 +1129,7 @@ class install_convert extends module if (!empty($schema['autoincrement'])) { - switch ($db->sql_layer) + switch ($db->get_sql_layer()) { case 'postgres': $db->sql_query("SELECT SETVAL('" . $schema['target'] . "_seq',(select case when max(" . $schema['autoincrement'] . ")>0 then max(" . $schema['autoincrement'] . ")+1 else 1 end from " . $schema['target'] . '));'); @@ -1268,7 +1268,7 @@ class install_convert extends module if (!empty($schema['autoincrement'])) { - switch ($db->sql_layer) + switch ($db->get_sql_layer()) { case 'mssql': case 'mssql_odbc': @@ -1301,7 +1301,7 @@ class install_convert extends module if ($sql_flag === true) { - switch ($db->sql_layer) + switch ($db->get_sql_layer()) { // If MySQL, we'll wait to have num_wait_rows rows to submit at once case 'mysql': @@ -1396,7 +1396,7 @@ class install_convert extends module if (!empty($schema['autoincrement'])) { - switch ($db->sql_layer) + switch ($db->get_sql_layer()) { case 'mssql': case 'mssql_odbc': @@ -1635,7 +1635,7 @@ class install_convert extends module 'RESULT' => $user->lang['DONE'], )); - if ($db->sql_error_triggered) + if ($db->get_sql_error_triggered()) { $template->assign_vars(array( 'S_ERROR_BOX' => true, @@ -1808,7 +1808,7 @@ class install_convert extends module global $convert; // Can we use IGNORE with this DBMS? - $sql_ignore = (strpos($db->sql_layer, 'mysql') === 0 && !defined('DEBUG')) ? 'IGNORE ' : ''; + $sql_ignore = (strpos($db->get_sql_layer(), 'mysql') === 0 && !defined('DEBUG')) ? 'IGNORE ' : ''; $insert_query = 'INSERT ' . $sql_ignore . 'INTO ' . $schema['target'] . ' ('; $aliases = array(); |