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

Renamed setUSLocale as per review

Browse source
This commit is contained in:
Jenny Tam 2018-01-02 14:42:08 -08:00
parent 62944347ef
commit f642954d35
11 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -442,7 +442,7 @@ function handleErrors()
} }
} }
function setUSLocale() function setUSAnsiLocale()
{ {
if (!isWindows()) { if (!isWindows()) {
// macOS the locale names are different in Linux or macOS // macOS the locale names are different in Linux or macOS

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -7,7 +7,7 @@ can be successfully retrieved as streams.
PHPT_EXEC=true PHPT_EXEC=true
--SKIPIF-- --SKIPIF--
<?// locale must be set before 1st connection <?// locale must be set before 1st connection
setUSLocale(); setUSAnsiLocale();
require('skipif_versions_old.inc'); require('skipif_versions_old.inc');
?> ?>
--FILE-- --FILE--
@ -124,7 +124,7 @@ function checkData($col, $actual, $expected)
} }
// locale must be set before 1st connection // locale must be set before 1st connection
setUSLocale(); setUSAnsiLocale();
global $testName; global $testName;
$testName = "Stream - Read"; $testName = "Stream - Read";

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

@ -7,7 +7,7 @@ PHPT_EXEC=true
--SKIPIF-- --SKIPIF--
<? <?
// locale must be set before 1st connection // locale must be set before 1st connection
setUSLocale(); setUSAnsiLocale();
require('skipif_versions_old.inc'); require('skipif_versions_old.inc');
?> ?>
--FILE-- --FILE--
@ -161,7 +161,7 @@ function checkData($col, $actual, $expected)
} }
// locale must be set before 1st connection // locale must be set before 1st connection
setUSLocale(); setUSAnsiLocale();
$testName = "Stream - Scrollable"; $testName = "Stream - Scrollable";
// error message expected with AE enabled // error message expected with AE enabled

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

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