From db5df5b6ac025f360cdc97182678536d88c0dccb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 19 Apr 2013 10:15:03 +0200
Subject: [ticket/10966] Introduce MSSQL base class for native and ODBC

PHPBB3-10966
---
 phpBB/includes/db/driver/mssqlnative.php | 44 +-------------------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

(limited to 'phpBB/includes/db/driver/mssqlnative.php')

diff --git a/phpBB/includes/db/driver/mssqlnative.php b/phpBB/includes/db/driver/mssqlnative.php
index 656cbd2437..6f433e10cf 100644
--- a/phpBB/includes/db/driver/mssqlnative.php
+++ b/phpBB/includes/db/driver/mssqlnative.php
@@ -191,7 +191,7 @@ class result_mssqlnative
 /**
 * @package dbal
 */
-class phpbb_db_driver_mssqlnative extends phpbb_db_driver
+class phpbb_db_driver_mssqlnative extends phpbb_db_driver_mssql_base
 {
 	var $m_insert_id = NULL;
 	var $last_query_text = '';
@@ -256,14 +256,6 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver
 		return ($this->sql_server_version) ? 'MSSQL<br />' . $this->sql_server_version : 'MSSQL';
 	}
 
-	/**
-	* {@inheritDoc}
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return $expr1 . ' + ' . $expr2;
-	}
-
 	/**
 	* {@inheritDoc}
 	*/
@@ -490,31 +482,6 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver
 		return false;
 	}
 
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_lower_text($column_name)
-	{
-		return "LOWER(SUBSTRING($column_name, 1, DATALENGTH($column_name)))";
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
 	/**
 	* return sql error array
 	* @access private
@@ -560,15 +527,6 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver
 		return $error;
 	}
 
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
 	/**
 	* Close sql connection
 	* @access private
-- 
cgit v1.2.1


From 3eeeaababd915bb102de523aa4d4378231745f26 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Thu, 20 Jun 2013 19:16:21 +0530
Subject: [ticket/11503] similar implementation for mssql_native and odbc

mssql_native and mssql_odbc db drivers varied at some places
where they should have been similar.

PHPBB3-11503
---
 phpBB/includes/db/driver/mssqlnative.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes/db/driver/mssqlnative.php')

diff --git a/phpBB/includes/db/driver/mssqlnative.php b/phpBB/includes/db/driver/mssqlnative.php
index 6f433e10cf..28fc88298a 100644
--- a/phpBB/includes/db/driver/mssqlnative.php
+++ b/phpBB/includes/db/driver/mssqlnative.php
@@ -326,7 +326,7 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver_mssql_base
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl)
+				if ($cache && $cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
@@ -394,7 +394,7 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver_mssql_base
 	*/
 	function sql_affectedrows()
 	{
-		return (!empty($this->query_result)) ? @sqlsrv_rows_affected($this->query_result) : false;
+		return ($this->db_connect_id) ? @sqlsrv_rows_affected($this->query_result) : false;
 	}
 
 	/**
@@ -409,7 +409,7 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver_mssql_base
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -474,9 +474,9 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver_mssql_base
 			return $cache->sql_freeresult($query_id);
 		}
 
-		if (isset($this->open_queries[$query_id]))
+		if (isset($this->open_queries[(int) $query_id]))
 		{
-			unset($this->open_queries[$query_id]);
+			unset($this->open_queries[(int) $query_id]);
 			return @sqlsrv_free_stmt($query_id);
 		}
 		return false;
-- 
cgit v1.2.1