mirror of
https://github.com/silverstripe/silverstripe-mssql
synced 2024-10-22 08:05:53 +02:00
Merge pull request #23 from tractorcow/pulls/1.0/update-api
Update API for 3.2 release
This commit is contained in:
commit
ade1ea69d7
@ -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);
|
||||
$handle = sqlsrv_query($this->dbConn, $sql);
|
||||
} else {
|
||||
return sqlsrv_query($dbConn, $sql, $parsedParameters);
|
||||
$handle = sqlsrv_query($this->dbConn, $sql, $parsedParameters);
|
||||
}
|
||||
});
|
||||
|
||||
if($handle) {
|
||||
$this->lastAffectedRows = sqlsrv_rows_affected($handle);
|
||||
} else {
|
||||
// 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);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user