From be2e9469fdc79dcf101b90d892d08b094144cdc9 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 17 Jun 2015 13:58:45 +1200
Subject: [PATCH] Update API for 3.2 release See
 https://github.com/silverstripe/silverstripe-framework/pull/4288

---
 code/SQLServerConnector.php | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/code/SQLServerConnector.php b/code/SQLServerConnector.php
index 08dfda8..27e0687 100644
--- a/code/SQLServerConnector.php
+++ b/code/SQLServerConnector.php
@@ -117,28 +117,25 @@ class SQLServerConnector extends DBConnector {
 	}
 
 	public function preparedQuery($sql, $parameters, $errorLevel = E_USER_ERROR) {
-		// Check if we should only preview this query
-		if ($this->previewWrite($sql)) return;
+		// Reset state
+		$this->lastAffectedRows = 0;
 		
+		// Run query
 		$parsedParameters = $this->parameterValues($parameters);
-		
-		// Benchmark query
-		$dbConn = $this->dbConn;
-		$handle = $this->benchmarkQuery($sql, function($sql) use($dbConn, $parsedParameters) {
-			if(empty($parsedParameters)) {
-				return sqlsrv_query($dbConn, $sql);
-			} else {
-				return sqlsrv_query($dbConn, $sql, $parsedParameters);
-			}
-		});
-		
-		if($handle) {
-			$this->lastAffectedRows = sqlsrv_rows_affected($handle);
+		if(empty($parsedParameters)) {
+			$handle = sqlsrv_query($this->dbConn, $sql);
 		} else {
+			$handle = sqlsrv_query($this->dbConn, $sql, $parsedParameters);
+		}
+		
+		// Check for error
+		if(!$handle) {
 			$this->databaseError($this->getLastError(), $errorLevel, $sql, $parsedParameters);
 			return null;
 		}
 		
+		// Report result
+		$this->lastAffectedRows = sqlsrv_rows_affected($handle);
 		return new SQLServerQuery($this, $handle);
 	}