diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-07-04 04:08:30 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-07-04 04:08:30 +0000 |
| commit | 291ab6216e4b4832fd49c237b933cc1abf83e588 (patch) | |
| tree | 873d5fdacade3d5751be9274b5f284b122ecadfa /phpBB/includes | |
| parent | 6a1f1f57213c69219850785cbca3b67e782a2cca (diff) | |
| download | forums-291ab6216e4b4832fd49c237b933cc1abf83e588.tar forums-291ab6216e4b4832fd49c237b933cc1abf83e588.tar.gz forums-291ab6216e4b4832fd49c237b933cc1abf83e588.tar.bz2 forums-291ab6216e4b4832fd49c237b933cc1abf83e588.tar.xz forums-291ab6216e4b4832fd49c237b933cc1abf83e588.zip | |
- Make sure that the table is empty before we start cramming things inside :D
git-svn-id: file:///svn/phpbb/trunk@6145 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index be1bcc3ecd..52a9732e82 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -144,7 +144,8 @@ class acp_database case 'mssql': case 'mssql_odbc': - $sql_data .= "BEGIN TRANSACTION\nGO\n"; + $sql_data .= "BEGIN TRANSACTION\n"; + $sql_data .= "GO\n"; break; } @@ -164,7 +165,8 @@ class acp_database case 'oracle': $sql_data .= '# Table: ' . $table_name . "\n"; - $sql_data .= "DROP TABLE $table_name;\n\\\n"; + $sql_data .= "DROP TABLE $table_name;\n"; + $sql_data .= '\\' . "\n"; break; case 'sqlite': @@ -189,11 +191,33 @@ class acp_database case 'mssql_odbc': $sql_data .= '# Table: ' . $table_name . "\n"; $sql_data .= "IF OBJECT_ID(N'$table_name', N'U') IS NOT NULL\n"; - $sql_data .= "DROP TABLE $table_name;\nGO\n"; + $sql_data .= "DROP TABLE $table_name;\n"; + $sql_data .= "GO\n"; break; } $sql_data .= $this->get_table_structure($table_name); } + // We might wanna empty out all that junk :D + else + { + switch (SQL_LAYER) + { + case 'mysqli': + case 'mysql4': + case 'mysql': + case 'mssql': + case 'mssql_odbc': + case 'oracle': + case 'postgres': + case 'firebird': + $sql_data .= 'TRUNCATE TABLE ' . $table_name . "\n"; + break; + + case 'sqlite': + $sql_data .= 'DELETE FROM ' . $table_name . "\n"; + break; + } + } // Now write the data for the first time. :) if ($store == true) { |