diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-04-22 17:44:36 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-04-22 17:44:36 +0000 |
| commit | d1f3349f7b7cd7816c125cf83616db154a43b8b1 (patch) | |
| tree | 4cdc88656f2bacaabe49fe72723b75e1a7e8a286 /phpBB/install/install.php | |
| parent | f0d7d05888222699f2cadb04c9b0cb3123aed2d9 (diff) | |
| download | forums-d1f3349f7b7cd7816c125cf83616db154a43b8b1.tar forums-d1f3349f7b7cd7816c125cf83616db154a43b8b1.tar.gz forums-d1f3349f7b7cd7816c125cf83616db154a43b8b1.tar.bz2 forums-d1f3349f7b7cd7816c125cf83616db154a43b8b1.tar.xz forums-d1f3349f7b7cd7816c125cf83616db154a43b8b1.zip | |
- dbal changes
git-svn-id: file:///svn/phpbb/trunk@5130 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/install.php')
| -rw-r--r-- | phpBB/install/install.php | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/phpBB/install/install.php b/phpBB/install/install.php index b9bb36276e..2980c9eef1 100644 --- a/phpBB/install/install.php +++ b/phpBB/install/install.php @@ -92,13 +92,20 @@ $available_dbms = array( 'DELIM' => ';', 'COMMENTS' => 'remove_remarks' ), - 'mysql4' => array( - 'LABEL' => 'MySQL 4.1.x', + 'mysqli' => array( + 'LABEL' => 'MySQL 4.1.x (MySQLi)', 'SCHEMA' => 'mysql', 'MODULE' => 'mysqli', 'DELIM' => ';', 'COMMENTS' => 'remove_remarks' ), + 'mysql4' => array( + 'LABEL' => 'MySQL 4', + 'SCHEMA' => 'mysql', + 'MODULE' => 'mysql', + 'DELIM' => ';', + 'COMMENTS' => 'remove_remarks' + ), 'mssql' => array( 'LABEL' => 'MS SQL Server 7/2000', 'SCHEMA' => 'mssql', @@ -106,13 +113,6 @@ $available_dbms = array( 'DELIM' => 'GO', 'COMMENTS' => 'remove_comments' ), - 'msaccess' => array( - 'LABEL' => 'MS Access [ ODBC ]', - 'SCHEMA' => '', - 'MODULE' => 'odbc', - 'DELIM' => '', - 'COMMENTS' => '' - ), 'mssql-odbc'=> array( 'LABEL' => 'MS SQL Server [ ODBC ]', 'SCHEMA' => 'mssql', @@ -1402,6 +1402,7 @@ function connect_check_db($error_connect, &$error, &$dbms, &$table_prefix, &$dbh { case 'mysql': case 'mysql4': + case 'mysqli': $sql = "SHOW TABLES"; $field = "Tables_in_{$dbname}"; break; @@ -1414,13 +1415,6 @@ function connect_check_db($error_connect, &$error, &$dbms, &$table_prefix, &$dbh $field = "name"; break; - case 'msaccess': - $sql = 'SELECT * FROM MSysObjects - WHERE Type = 1 - AND Name Not Like "MSys*"'; - $field = "Name"; - break; - case 'postgres': $sql = "SELECT relname FROM pg_class |