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

Testing locale issues

Browse source
This commit is contained in:
Jenny Tam 2017-12-19 14:35:28 -08:00
parent 35146b77d2
commit d7a1aca5c7
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,18 +84,6 @@ function isDaasMode()
return ($daasMode ? true : false); return ($daasMode ? true : false);
} }
// function isAEQualified($conn)
// {
// $msodbcsql_ver = sqlsrv_client_info($conn)['DriverVer'];
// $server_ver = sqlsrv_server_info($conn)['SQLServerVersion'];
// $msodbcsql_maj = explode(".", $msodbcsql_ver)[0];
// $msodbcsql_min = explode(".", $msodbcsql_ver)[1];
// if ($msodbcsql_maj < 17 || explode('.', $server_ver)[0] < 13) {
// return false;
// }
// return true;
// }
function startTest($testName) function startTest($testName)
{ {
if (traceMode()) { if (traceMode()) {
@ -455,10 +443,17 @@ function handleErrors()
} }
// non-UTF8 locale support in ODBC 17 and above only // non-UTF8 locale support in ODBC 17 and above only
// if AE enabled, only supported in Windows (AE limitations)
function isLocaleSupported() function isLocaleSupported()
{ {
if (isWindows()) {
return true;
}
if (AE\isDataEncrypted()) {
return false;
}
// now check ODBC version
$conn = AE\connect(); $conn = AE\connect();
$msodbcsql_ver = sqlsrv_client_info($conn)['DriverVer']; $msodbcsql_ver = sqlsrv_client_info($conn)['DriverVer'];
if (explode(".", $msodbcsql_ver)[0] < 17) { if (explode(".", $msodbcsql_ver)[0] < 17) {
return false; return false;

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

@ -330,7 +330,7 @@ function getSeqPlaceholders($num)
*/ */
function isColEncrypted() function isColEncrypted()
{ {
global $keystore, $dataEncrypted; global $keystore;
if ($keystore === KEYSTORE_NONE) { if ($keystore === KEYSTORE_NONE) {
return false; return false;
} else { } else {