From aee82d3a308b8df995b4418dcbdd15b409878542 Mon Sep 17 00:00:00 2001
From: David M <davidmj@users.sourceforge.net>
Date: Tue, 16 Oct 2007 14:59:39 +0000
Subject: [PATCH] MSSQL works properly with SQL update related tools

git-svn-id: file:///svn/phpbb/trunk@8198 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/docs/CHANGELOG.html         | 6 ++++++
 phpBB/includes/db/db_tools.php    | 2 +-
 phpBB/install/database_update.php | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 7d92aa6a5a..4d47a6be41 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -78,6 +78,12 @@
 
 		<div class="content">
 
+	<a name="v30rc6"></a><h3>1.i. Changes since 3.0.RC7</h3>
+
+	<ul>
+		<li>[Fix] Fixed MSSQL related bug in the update system</li>
+	</ul>
+
 	<a name="v30rc6"></a><h3>1.i. Changes since 3.0.RC6</h3>
 
 	<ul>
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 589ca39258..ee8825f136 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -500,7 +500,7 @@ class phpbb_db_tools
 			case 'mssql':
 				$sql = "SELECT c.name
 					FROM syscolumns c
-					LEFT JOIN sysobjects o (ON c.id = o.id)
+					LEFT JOIN sysobjects o ON c.id = o.id
 					WHERE o.name = '{$table}'";
 				$result = $this->db->sql_query($sql);
 				while ($row = $this->db->sql_fetchrow($result))
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4d878b15c0..4c4c1eb690 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1759,7 +1759,7 @@ function column_exists($dbms, $table, $column_name)
 		case 'mssql':
 			$sql = "SELECT c.name
 				FROM syscolumns c
-				LEFT JOIN sysobjects o (ON c.id = o.id)
+				LEFT JOIN sysobjects o ON c.id = o.id
 				WHERE o.name = '{$table}'";
 			$result = $db->sql_query($sql);
 			while ($row = $db->sql_fetchrow($result))