From c38b0830579ba2c13cb2a946a9c7e939e4b2d2cd Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 28 Jul 2011 15:57:09 +0200
Subject: [PATCH 1/3] [ticket/10294] Fix sql_affectedrows() in mssqlnative
 driver.

sqlsrv_rows_affected() expects a statement resource, not a connection resource.

PHPBB3-10294
---
 phpBB/includes/db/mssqlnative.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index 6810562d17..7fbc374e77 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -396,7 +396,7 @@ class dbal_mssqlnative extends dbal
 	*/
 	function sql_affectedrows()
 	{
-		return ($this->db_connect_id) ? @sqlsrv_rows_affected($this->db_connect_id) : false;
+		return (!empty($this->query_result)) ? @sqlsrv_rows_affected($this->query_result) : false;
 	}
 
 	/**

From d938d5d3994e5febd6a7530e740e24b5727d38c4 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sun, 4 Sep 2011 20:22:36 -0500
Subject: [PATCH 2/3] [ticket/10351] Fix Oracle's sql_column_remove()

The correct syntax is DROP COLUMN.

PHPBB3-10351
---
 phpBB/includes/db/db_tools.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 2cb0fcef68..265fe1bb25 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -1805,7 +1805,7 @@ class phpbb_db_tools
 			break;
 
 			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP ' . $column_name;
+				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name;
 			break;
 
 			case 'postgres':

From 5c7f5f05166aa5e493f2cbeddd2b5e36eb80d4df Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sun, 4 Sep 2011 20:31:34 -0500
Subject: [PATCH 3/3] [ticket/10352] Add missing break for Oracle's
 sql_table_drop()

PHPBB3-10352
---
 phpBB/includes/db/db_tools.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 2cb0fcef68..48bbefa2dd 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -1956,6 +1956,7 @@ class phpbb_db_tools
 					$statements[] = "DROP SEQUENCE {$row['referenced_name']}";
 				}
 				$this->db->sql_freeresult($result);
+			break;
 
 			case 'postgres':
 				// PGSQL does not "tightly" bind sequences and tables, we must guess...