diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-10-06 12:07:35 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-10-06 12:07:35 +0200 |
| commit | bd02c5bd085e957aa4341e7fc2df2199081ab069 (patch) | |
| tree | ea737eab62dc1f56bb3760542b0f27095f6eca64 /phpBB/install | |
| parent | 68c197fd6012b5435a29a288113b957e7957de59 (diff) | |
| download | forums-bd02c5bd085e957aa4341e7fc2df2199081ab069.tar forums-bd02c5bd085e957aa4341e7fc2df2199081ab069.tar.gz forums-bd02c5bd085e957aa4341e7fc2df2199081ab069.tar.bz2 forums-bd02c5bd085e957aa4341e7fc2df2199081ab069.tar.xz forums-bd02c5bd085e957aa4341e7fc2df2199081ab069.zip | |
[ticket/16051] Remove mysql driver as it's no longer supported in PHP >= 7.0
PHPBB3-16051
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convert/convertor.php | 16 | ||||
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 22 |
2 files changed, 1 insertions, 37 deletions
diff --git a/phpBB/install/convert/convertor.php b/phpBB/install/convert/convertor.php index e79ad64012..09088fe824 100644 --- a/phpBB/install/convert/convertor.php +++ b/phpBB/install/convert/convertor.php @@ -148,16 +148,6 @@ class convertor $convert->src_truncate_statement = 'DELETE FROM '; break; - // Thanks MySQL, for silently converting... - case 'mysql': - case 'mysql4': - if (version_compare($src_db->sql_server_info(true, false), '4.1.3', '>=')) - { - $convert->mysql_convert = true; - } - $convert->src_truncate_statement = 'TRUNCATE TABLE '; - break; - case 'mysqli': $convert->mysql_convert = true; $convert->src_truncate_statement = 'TRUNCATE TABLE '; @@ -748,8 +738,6 @@ class convertor switch ($db->get_sql_layer()) { // If MySQL, we'll wait to have num_wait_rows rows to submit at once - case 'mysql': - case 'mysql4': case 'mysqli': $waiting_rows[] = '(' . implode(', ', $insert_values) . ')'; @@ -1258,9 +1246,7 @@ class convertor global $db, $user; global $convert; - // Can we use IGNORE with this DBMS? - $sql_ignore = (strpos($db->get_sql_layer(), 'mysql') === 0 && !defined('DEBUG')) ? 'IGNORE ' : ''; - $insert_query = 'INSERT ' . $sql_ignore . 'INTO ' . $schema['target'] . ' ('; + $insert_query = 'INSERT INTO ' . $schema['target'] . ' ('; $aliases = array(); diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 69dc7bb4bc..b89c086533 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1754,21 +1754,6 @@ function phpbb_create_userconv_table() switch ($db->get_sql_layer()) { - case 'mysql': - $map_dbms = 'mysql_40'; - break; - - case 'mysql4': - if (version_compare($db->sql_server_info(true), '4.1.3', '>=')) - { - $map_dbms = 'mysql_41'; - } - else - { - $map_dbms = 'mysql_40'; - } - break; - case 'mysqli': $map_dbms = 'mysql_41'; break; @@ -1794,13 +1779,6 @@ function phpbb_create_userconv_table() )'; break; - case 'mysql_40': - $create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' ( - user_id mediumint(8) NOT NULL, - username_clean blob NOT NULL - )'; - break; - case 'mysql_41': $create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' ( user_id mediumint(8) NOT NULL, |