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

Merge pull request #650 from yitam/macLocale

Browse source 
Fix tests with locales
This commit is contained in:
Jenny Tam 2018-01-02 15:21:37 -08:00 committed by GitHub
parent b5b19dc359 f642954d35
commit e3b012989f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 30 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -442,6 +442,16 @@ function handleErrors()
}
}
function setUSAnsiLocale()
{
if (!isWindows()) {
// macOS the locale names are different in Linux or macOS
$locale = strtoupper(PHP_OS) === 'LINUX' ? "en_US.ISO-8859-1" : "en_US.ISO8859-1";
setlocale(LC_ALL, $locale);
}
}
// non-UTF8 locale support in ODBC 17 and above only
// if AE enabled, only supported in Windows (AE limitations)
function isLocaleSupported()

9
test/functional/sqlsrv/TC34_PrepAndExec.phpt
View file

@ -8,9 +8,7 @@ PHPT_EXEC=true
--SKIPIF--
<?php
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
require('skipif_versions_old.inc');
?>
--FILE--
@ -90,10 +88,7 @@ function prepareAndExecute($noPasses)
}
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
$testName = "Statement - Prepare and Execute";
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)

9
test/functional/sqlsrv/TC42_FetchField.phpt
View file

@ -8,9 +8,7 @@ PHPT_EXEC=true
--SKIPIF--
<?php
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
require('skipif_versions_old.inc');
?>
--FILE--
@ -68,10 +66,7 @@ function fetchFields()
}
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
$testName = "Fetch - Field";
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)

9
test/functional/sqlsrv/TC43_FetchData.phpt
View file

@ -5,9 +5,7 @@ PHPT_EXEC=true
--SKIPIF--
<?
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
require('skipif_versions_old.inc');
?>
--FILE--
@ -97,10 +95,7 @@ function checkData($col, $actual, $expected)
return ($success);
}
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
$testName = "Fetch - Field Data";
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)

10
test/functional/sqlsrv/TC44_FetchArray.phpt
View file

@ -8,9 +8,7 @@ PHPT_EXEC=true
--SKIPIF--
<?
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
require('skipif_versions_old.inc');
?>
--FILE--
@ -153,11 +151,7 @@ function checkData($row, $stmt, $index, $mode)
}
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
global $testName;
setUSAnsiLocale();
$testName = "Fetch - Array";
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)

9
test/functional/sqlsrv/TC45_FetchObject.phpt
View file

@ -7,9 +7,7 @@ PHPT_EXEC=true
--SKIPIF--
<?php
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
require('skipif_versions_old.inc');
?>
--FILE--
@ -128,10 +126,7 @@ function checkData($rows, $fields, $actualValues, $expectedValues)
}
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
$testName = "Fetch - Object";
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)

10
test/functional/sqlsrv/TC46_FetchNextResult.phpt
View file

@ -7,9 +7,7 @@ PHPT_EXEC=true
--SKIPIF--
<?
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
require('skipif_versions_old.inc');
?>
--FILE--
@ -86,11 +84,7 @@ function fetchFields()
}
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
global $testName;
setUSAnsiLocale();
$testName = "Fetch - Next Result";
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)

9
test/functional/sqlsrv/TC48_FetchScrollable.phpt
View file

@ -7,9 +7,7 @@ PHPT_EXEC=true
--SKIPIF--
<?php
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
require('skipif_versions_old.inc');
?>
--FILE--
@ -137,10 +135,7 @@ function checkData($rows, $fields, $actualValues, $expectedValues)
}
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
$testName = "Fetch - Scrollable";
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)

9
test/functional/sqlsrv/TC51_StreamRead.phpt
View file

@ -7,9 +7,7 @@ can be successfully retrieved as streams.
PHPT_EXEC=true
--SKIPIF--
<?// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
require('skipif_versions_old.inc');
?>
--FILE--
@ -126,10 +124,7 @@ function checkData($col, $actual, $expected)
}
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
global $testName;
$testName = "Stream - Read";

10
test/functional/sqlsrv/TC55_StreamScrollable.phpt
View file

@ -7,9 +7,7 @@ PHPT_EXEC=true
--SKIPIF--
<?
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
require('skipif_versions_old.inc');
?>
--FILE--
@ -163,11 +161,7 @@ function checkData($col, $actual, $expected)
}
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
global $testName;
setUSAnsiLocale();
$testName = "Stream - Scrollable";
// error message expected with AE enabled

9
test/functional/sqlsrv/test_stream_large_data.phpt
View file

@ -3,10 +3,7 @@ streaming large amounts of data into a database and getting it out as a string e
--SKIPIF--
<?
// locale must be set before 1st connection
if (!isWindows() ) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
require('skipif.inc');
?>
--FILE--
@ -254,9 +251,7 @@ function CompareLengths($filesizes, $lens1, $lens2, $count, $useUTF8)
}
// locale must be set before 1st connection
if (!isWindows()) {
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
setUSAnsiLocale();
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)
if (isLocaleSupported()) {