mirror of
https://github.com/silverstripe/silverstripe-mssql
synced 2024-10-22 08:05:53 +02:00
BUGFIX: re-enabling MARS, framework assumes it can run DB::query without fetching the results, which leaves the result set open and prohibits executing another query in the mean time
This commit is contained in:
parent
1cab98c219
commit
d066f99d5e
@ -130,14 +130,14 @@ class MSSQLDatabase extends SS_Database {
|
|||||||
if(defined('MSSQL_USE_WINDOWS_AUTHENTICATION') && MSSQL_USE_WINDOWS_AUTHENTICATION == true) {
|
if(defined('MSSQL_USE_WINDOWS_AUTHENTICATION') && MSSQL_USE_WINDOWS_AUTHENTICATION == true) {
|
||||||
$connectionInfo = array(
|
$connectionInfo = array(
|
||||||
'CharacterSet' => 'UTF-8',
|
'CharacterSet' => 'UTF-8',
|
||||||
'MultipleActiveResultSets' => false
|
'MultipleActiveResultSets' => true
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
$connectionInfo = array(
|
$connectionInfo = array(
|
||||||
'UID' => $parameters['username'],
|
'UID' => $parameters['username'],
|
||||||
'PWD' => $parameters['password'],
|
'PWD' => $parameters['password'],
|
||||||
'CharacterSet' => 'UTF-8',
|
'CharacterSet' => 'UTF-8',
|
||||||
'MultipleActiveResultSets' => false
|
'MultipleActiveResultSets' => true
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
$this->dbConn = sqlsrv_connect($parameters['server'], $connectionInfo);
|
$this->dbConn = sqlsrv_connect($parameters['server'], $connectionInfo);
|
||||||
|
Loading…
Reference in New Issue
Block a user