dprevot/php-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Set the driver argument for getDSN to null by default (#798)

Browse source 
* Added the driver argument to getDSN

* Dropped the driver argument but set to null as default

* Removed the AE condition in locale support

* Modified the AE condition for locale support
This commit is contained in:
Jenny Tam 2018-06-26 13:41:07 -07:00 committed by GitHub
parent 81ff0851ea
commit eeea7878fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc
View file

@ -72,7 +72,7 @@ function connect($keywords = '', $options=array(), $errmode = PDO::ERRMODE_EXCEP
* @param bool $disableCE : flag for disabling column encryption even when keystore is NOT none
* @return string dsn string used for PDO constructor
*/
function getDSN($sqlsrvserver, $database, $driver, $keywords = '', $disableCE = false)
function getDSN($sqlsrvserver, $database, $driver = null, $keywords = '', $disableCE = false)
{
require("MsSetup.inc");
$dsn = "";
@ -85,7 +85,7 @@ function getDSN($sqlsrvserver, $database, $driver, $keywords = '', $disableCE =
if ($database) {
$dsn .= "database=$database;";
}
if ($driver) {
if (!is_null($driver)) {
$dsn .= "driver=$driver;";
}
if ($keystore != "none" && !$disableCE) {

2
test/functional/sqlsrv/MsCommon.inc
View file

@ -472,7 +472,7 @@ function isLocaleSupported()
if (isWindows()) {
return true;
}
if (AE\isColEncrypted()) {
if (AE\isDataEncrypted()) {
return false;
}
// now check ODBC version