diff options
| author | David M <davidmj@users.sourceforge.net> | 2008-01-07 15:19:38 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2008-01-07 15:19:38 +0000 |
| commit | 2928574ed46334bb8dbbb6612a62db3c3654ba12 (patch) | |
| tree | c010569c70e52dbda45dd835a613977fb30f9dc8 /phpBB/includes/acp/acp_database.php | |
| parent | 159ce6f8d1bddbe7afc055f70cab3107b9c74a5f (diff) | |
| download | forums-2928574ed46334bb8dbbb6612a62db3c3654ba12.tar forums-2928574ed46334bb8dbbb6612a62db3c3654ba12.tar.gz forums-2928574ed46334bb8dbbb6612a62db3c3654ba12.tar.bz2 forums-2928574ed46334bb8dbbb6612a62db3c3654ba12.tar.xz forums-2928574ed46334bb8dbbb6612a62db3c3654ba12.zip | |
- a few tiny clean ups
- a new MS SQL DBAL, it does not work so hot because of issues with the extension it depends on
git-svn-id: file:///svn/phpbb/trunk@8313 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_database.php')
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index 64806eda59..980f4fcf48 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -86,9 +86,8 @@ class acp_database $time = time(); $filename = 'backup_' . $time . '_' . unique_id(); - switch ($db->sql_layer) + switch ($db->dbms_type) { - case 'mysqli': case 'mysql': $extractor = new mysql_extractor($download, $store, $format, $filename, $time); break; @@ -106,7 +105,6 @@ class acp_database break; case 'mssql': - case 'mssql_odbc': $extractor = new mssql_extractor($download, $store, $format, $filename, $time); break; @@ -131,7 +129,7 @@ class acp_database else { // We might wanna empty out all that junk :D - switch ($db->sql_layer) + switch ($db->dbms_type) { case 'sqlite': case 'firebird': @@ -140,7 +138,6 @@ class acp_database break; case 'mssql': - case 'mssql_odbc': $extractor->flush('TRUNCATE TABLE ' . $table_name . "GO\n"); break; @@ -318,11 +315,11 @@ class acp_database break; } - switch ($db->sql_layer) + switch ($db->dbms_type) { case 'mysql': - case 'mysqli': case 'sqlite': + case 'db2': while (($sql = $fgetd($fp, ";\n", $read, $seek, $eof)) !== false) { $db->sql_query($sql); @@ -372,7 +369,6 @@ class acp_database break; case 'mssql': - case 'mssql_odbc': while (($sql = $fgetd($fp, "GO\n", $read, $seek, $eof)) !== false) { $db->sql_query($sql); @@ -1356,10 +1352,15 @@ class mssql_extractor extends base_extractor { $this->write_data_mssql($table_name); } - else + else if ($db->sql_layer === 'mssql_odbc') { $this->write_data_odbc($table_name); } + else + { + // @todo: write code for MS SQL 2005 DBAL + trigger_error('KungFuDeathGrip'); + } } function write_data_mssql($table_name) |