diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-22 23:41:26 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-22 23:41:26 +0200 |
| commit | 80e0851189fa599a36c15659641b5ddfe82715a5 (patch) | |
| tree | 9a3bda48036018e43e0d9d62717293db180d4b54 /phpBB/install | |
| parent | d18d3b30c70c0fb48cad14576376ee51671d094e (diff) | |
| parent | 4f2acbaed2028cc1b5ad96f6eada97b1cc94532f (diff) | |
| download | forums-80e0851189fa599a36c15659641b5ddfe82715a5.tar forums-80e0851189fa599a36c15659641b5ddfe82715a5.tar.gz forums-80e0851189fa599a36c15659641b5ddfe82715a5.tar.bz2 forums-80e0851189fa599a36c15659641b5ddfe82715a5.tar.xz forums-80e0851189fa599a36c15659641b5ddfe82715a5.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12747] Remove some methods which are not used anymore
[ticket/12747] Drop support for Firebird
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 7 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 2 | ||||
| -rw-r--r-- | phpBB/install/install_convert.php | 3 |
3 files changed, 1 insertions, 11 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index a2bfabd2fd..84e9e8c462 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1804,13 +1804,6 @@ function phpbb_create_userconv_table() $drop_sql = 'DROP TABLE ' . USERCONV_TABLE; switch ($map_dbms) { - case 'firebird': - $create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' ( - user_id INTEGER NOT NULL, - username_clean VARCHAR(255) CHARACTER SET UTF8 DEFAULT \'\' NOT NULL COLLATE UNICODE - )'; - break; - case 'mssql': $create_sql = 'CREATE TABLE [' . USERCONV_TABLE . '] ( [user_id] [int] NOT NULL , diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 44dbe43cf8..72073be880 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -182,7 +182,7 @@ header('Content-type: text/html; charset=UTF-8'); define('IN_DB_UPDATE', true); /** -* @todo firebird/mysql update? +* @todo mysql update? */ // End startup code diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 4d6aff154c..a0d5e802e6 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -252,7 +252,6 @@ class install_convert extends module { case 'sqlite': case 'sqlite3': - case 'firebird': $db->sql_query('DELETE FROM ' . SESSIONS_KEYS_TABLE); $db->sql_query('DELETE FROM ' . SESSIONS_TABLE); break; @@ -700,7 +699,6 @@ class install_convert extends module { case 'sqlite': case 'sqlite3': - case 'firebird': $convert->src_truncate_statement = 'DELETE FROM '; break; @@ -733,7 +731,6 @@ class install_convert extends module { case 'sqlite': case 'sqlite3': - case 'firebird': $convert->truncate_statement = 'DELETE FROM '; break; |