From a4d0eba7814d633ee3b4a7f0d9bc47854c5845a5 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 19 Nov 2007 13:33:29 +0000
Subject: hopefully fixing bug #14890 - need to test later

git-svn-id: file:///svn/phpbb/trunk@8247 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/install/database_update.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 3f39b7d494..24d8c80bd1 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1913,7 +1913,6 @@ function prepare_column_data($dbms, $column_data, $table_name, $column_name)
 	}
 
 	$sql = '';
-
 	$return_array = array();
 
 	switch ($dbms)
@@ -1938,22 +1937,26 @@ function prepare_column_data($dbms, $column_data, $table_name, $column_name)
 
 		case 'mssql':
 			$sql .= " {$column_type} ";
+			$sql_default = " {$column_type} ";
 
-			// we do not support MSSQL DEFAULTs for the near future
-			/*if (!is_null($column_data[1]))
+			// For adding columns we need the default definition
+			if (!is_null($column_data[1]))
 			{
 				// For hexadecimal values do not use single quotes
 				if (strpos($column_data[1], '0x') === 0)
 				{
-					$sql .= 'DEFAULT (' . $column_data[1] . ') ';
+					$sql_default .= 'DEFAULT (' . $column_data[1] . ') ';
 				}
 				else
 				{
-					$sql .= 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
+					$sql_default .= 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
 				}
-			}*/
+			}
 
 			$sql .= 'NOT NULL';
+			$sql_default .= 'NOT NULL';
+
+			$return_array['column_type_sql_default'] = $sql_default;
 		break;
 
 		case 'mysql_40':
@@ -2059,7 +2062,7 @@ function sql_column_add($dbms, $table_name, $column_name, $column_data)
 		break;
 
 		case 'mssql':
-			$sql = 'ALTER TABLE [' . $table_name . '] ADD [' . $column_name . '] ' . $column_data['column_type_sql'];
+			$sql = 'ALTER TABLE [' . $table_name . '] ADD [' . $column_name . '] ' . $column_data['column_type_sql_default'];
 			_sql($sql, $errored, $error_ary);
 		break;
 
-- 
cgit v1.2.1