From 190b4282df5c5c81123b1ed371eeada385831e99 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 13 Apr 2014 16:43:57 +0200
Subject: [PATCH] [ticket/12012] Return SQL statements for index drop/create

Otherwise we recreate the index before changing the column

PHPBB3-12012
---
 phpBB/phpbb/db/tools.php | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php
index c2285bcf80..113059900a 100644
--- a/phpBB/phpbb/db/tools.php
+++ b/phpBB/phpbb/db/tools.php
@@ -2336,21 +2336,32 @@ class tools
 
 			case 'mssql':
 			case 'mssqlnative':
+				// We need the data here
+				$old_return_statements = $this->return_statements;
+				$this->return_statements = true;
+
 				$indexes = $this->mssql_get_existing_indexes($table_name, $column_name);
 
+				// Drop any indexes
 				if (!empty($indexes))
 				{
 					foreach ($indexes as $index_name => $index_data)
 					{
-						$this->sql_index_drop($table_name, $index_name);
+						$result = $this->sql_index_drop($table_name, $index_name);
+						$statements = array_merge($statements, $result);
 					}
 				}
 
-				$statements = $this->mssql_drop_default_constraints($table_name, $column_name);
+				// Drop default value constraint
+				$result = $this->mssql_drop_default_constraints($table_name, $column_name);
+				$statements = array_merge($statements, $result);
+
+				// Change the column
 				$statements[] = 'ALTER TABLE [' . $table_name . '] ALTER COLUMN [' . $column_name . '] ' . $column_data['column_type_sql'];
 
 				if (!empty($column_data['default']))
 				{
+					// Add new default value constraint
 					$statements[] = 'ALTER TABLE [' . $table_name . '] ADD CONSTRAINT [DF_' . $table_name . '_' . $column_name . '_1] ' . $this->db->sql_escape($column_data['default']) . ' FOR [' . $column_name . ']';
 				}
 
@@ -2359,9 +2370,12 @@ class tools
 					// Recreate indexes after we changed the column
 					foreach ($indexes as $index_name => $index_data)
 					{
-						$this->sql_create_index($table_name, $index_name, $index_data);
+						$result = $this->sql_create_index($table_name, $index_name, $index_data);
+						$statements = array_merge($statements, $result);
 					}
 				}
+
+				$this->return_statements = $old_return_statements;
 			break;
 
 			case 'mysql_40':