From 49cc38ebba21dc8b26240a87a23f1d422dd74472 Mon Sep 17 00:00:00 2001 From: David M Date: Wed, 11 Jul 2007 23:27:31 +0000 Subject: - Bring MS SQL up to par git-svn-id: file:///svn/phpbb/trunk@7871 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/database_update.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'phpBB/install/database_update.php') diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 6346f6bccf..dfd9a02b3c 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -726,7 +726,7 @@ if (version_compare($current_version, '3.0.RC3', '<=')) { // last version, mssql had issues with index removal case 'mssql': - $sql = 'DROP INDEX ' . $table_name . '\.' . $bad_index; + $sql = 'DROP INDEX ' . $table_name . '.' . $bad_index; _sql($sql, $errored, $error_ary); $no_updates = false; @@ -1166,7 +1166,8 @@ function prepare_column_data($dbms, $column_data) case 'mssql': $sql .= " {$column_type} "; - if (!is_null($column_data[1])) + // we do not support MSSQL DEFAULTs for the near future + /*if (!is_null($column_data[1])) { // For hexadecimal values do not use single quotes if (strpos($column_data[1], '0x') === 0) @@ -1177,7 +1178,7 @@ function prepare_column_data($dbms, $column_data) { $sql .= 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') '; } - } + }*/ $sql .= 'NOT NULL'; break; @@ -1464,7 +1465,7 @@ function sql_index_drop($dbms, $index_name, $table_name) switch ($dbms) { case 'mssql': - $sql = 'DROP INDEX ' . $table_name . '\.' . $index_name; + $sql = 'DROP INDEX ' . $table_name . '.' . $index_name; _sql($sql, $errored, $error_ary); break; -- cgit v1.2.1