Renamed setUSLocale as per review
This commit is contained in:
parent
62944347ef
commit
f642954d35
|
@ -442,7 +442,7 @@ function handleErrors()
|
|||
}
|
||||
}
|
||||
|
||||
function setUSLocale()
|
||||
function setUSAnsiLocale()
|
||||
{
|
||||
if (!isWindows()) {
|
||||
// macOS the locale names are different in Linux or macOS
|
||||
|
|
|
@ -8,7 +8,7 @@ PHPT_EXEC=true
|
|||
--SKIPIF--
|
||||
<?php
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
require('skipif_versions_old.inc');
|
||||
?>
|
||||
--FILE--
|
||||
|
@ -88,7 +88,7 @@ function prepareAndExecute($noPasses)
|
|||
}
|
||||
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
$testName = "Statement - Prepare and Execute";
|
||||
|
||||
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)
|
||||
|
|
|
@ -8,7 +8,7 @@ PHPT_EXEC=true
|
|||
--SKIPIF--
|
||||
<?php
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
require('skipif_versions_old.inc');
|
||||
?>
|
||||
--FILE--
|
||||
|
@ -66,7 +66,7 @@ function fetchFields()
|
|||
}
|
||||
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
$testName = "Fetch - Field";
|
||||
|
||||
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)
|
||||
|
|
|
@ -5,7 +5,7 @@ PHPT_EXEC=true
|
|||
--SKIPIF--
|
||||
<?
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
require('skipif_versions_old.inc');
|
||||
?>
|
||||
--FILE--
|
||||
|
@ -95,7 +95,7 @@ function checkData($col, $actual, $expected)
|
|||
return ($success);
|
||||
}
|
||||
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
$testName = "Fetch - Field Data";
|
||||
|
||||
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)
|
||||
|
|
|
@ -8,7 +8,7 @@ PHPT_EXEC=true
|
|||
--SKIPIF--
|
||||
<?
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
require('skipif_versions_old.inc');
|
||||
?>
|
||||
--FILE--
|
||||
|
@ -151,7 +151,7 @@ function checkData($row, $stmt, $index, $mode)
|
|||
}
|
||||
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
$testName = "Fetch - Array";
|
||||
|
||||
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)
|
||||
|
|
|
@ -7,7 +7,7 @@ PHPT_EXEC=true
|
|||
--SKIPIF--
|
||||
<?php
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
require('skipif_versions_old.inc');
|
||||
?>
|
||||
--FILE--
|
||||
|
@ -126,7 +126,7 @@ function checkData($rows, $fields, $actualValues, $expectedValues)
|
|||
}
|
||||
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
$testName = "Fetch - Object";
|
||||
|
||||
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)
|
||||
|
|
|
@ -7,7 +7,7 @@ PHPT_EXEC=true
|
|||
--SKIPIF--
|
||||
<?
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
require('skipif_versions_old.inc');
|
||||
?>
|
||||
--FILE--
|
||||
|
@ -84,7 +84,7 @@ function fetchFields()
|
|||
}
|
||||
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
$testName = "Fetch - Next Result";
|
||||
|
||||
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)
|
||||
|
|
|
@ -7,7 +7,7 @@ PHPT_EXEC=true
|
|||
--SKIPIF--
|
||||
<?php
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
require('skipif_versions_old.inc');
|
||||
?>
|
||||
--FILE--
|
||||
|
@ -135,7 +135,7 @@ function checkData($rows, $fields, $actualValues, $expectedValues)
|
|||
}
|
||||
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
$testName = "Fetch - Scrollable";
|
||||
|
||||
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)
|
||||
|
|
|
@ -7,7 +7,7 @@ can be successfully retrieved as streams.
|
|||
PHPT_EXEC=true
|
||||
--SKIPIF--
|
||||
<?// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
require('skipif_versions_old.inc');
|
||||
?>
|
||||
--FILE--
|
||||
|
@ -124,7 +124,7 @@ function checkData($col, $actual, $expected)
|
|||
}
|
||||
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
global $testName;
|
||||
$testName = "Stream - Read";
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ PHPT_EXEC=true
|
|||
--SKIPIF--
|
||||
<?
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
require('skipif_versions_old.inc');
|
||||
?>
|
||||
--FILE--
|
||||
|
@ -161,7 +161,7 @@ function checkData($col, $actual, $expected)
|
|||
}
|
||||
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
$testName = "Stream - Scrollable";
|
||||
|
||||
// error message expected with AE enabled
|
||||
|
|
|
@ -3,7 +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
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
require('skipif.inc');
|
||||
?>
|
||||
--FILE--
|
||||
|
@ -251,7 +251,7 @@ function CompareLengths($filesizes, $lens1, $lens2, $count, $useUTF8)
|
|||
}
|
||||
|
||||
// locale must be set before 1st connection
|
||||
setUSLocale();
|
||||
setUSAnsiLocale();
|
||||
|
||||
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)
|
||||
if (isLocaleSupported()) {
|
||||
|
|
Loading…
Reference in a new issue