From f642954d3536e89511f343904d064e9a295c6e80 Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Tue, 2 Jan 2018 14:42:08 -0800
Subject: [PATCH] Renamed setUSLocale as per review

---
 test/functional/sqlsrv/MsCommon.inc                | 2 +-
 test/functional/sqlsrv/TC34_PrepAndExec.phpt       | 4 ++--
 test/functional/sqlsrv/TC42_FetchField.phpt        | 4 ++--
 test/functional/sqlsrv/TC43_FetchData.phpt         | 4 ++--
 test/functional/sqlsrv/TC44_FetchArray.phpt        | 4 ++--
 test/functional/sqlsrv/TC45_FetchObject.phpt       | 4 ++--
 test/functional/sqlsrv/TC46_FetchNextResult.phpt   | 4 ++--
 test/functional/sqlsrv/TC48_FetchScrollable.phpt   | 4 ++--
 test/functional/sqlsrv/TC51_StreamRead.phpt        | 4 ++--
 test/functional/sqlsrv/TC55_StreamScrollable.phpt  | 4 ++--
 test/functional/sqlsrv/test_stream_large_data.phpt | 4 ++--
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/test/functional/sqlsrv/MsCommon.inc b/test/functional/sqlsrv/MsCommon.inc
index db7b3e10..117e9de4 100644
--- a/test/functional/sqlsrv/MsCommon.inc
+++ b/test/functional/sqlsrv/MsCommon.inc
@@ -442,7 +442,7 @@ function handleErrors()
     }
 }
 
-function setUSLocale()
+function setUSAnsiLocale()
 {
     if (!isWindows()) {
         // macOS the locale names are different in Linux or macOS
diff --git a/test/functional/sqlsrv/TC34_PrepAndExec.phpt b/test/functional/sqlsrv/TC34_PrepAndExec.phpt
index 06d2f14a..1af83b51 100644
--- a/test/functional/sqlsrv/TC34_PrepAndExec.phpt
+++ b/test/functional/sqlsrv/TC34_PrepAndExec.phpt
@@ -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)
diff --git a/test/functional/sqlsrv/TC42_FetchField.phpt b/test/functional/sqlsrv/TC42_FetchField.phpt
index ef030b16..f41102da 100644
--- a/test/functional/sqlsrv/TC42_FetchField.phpt
+++ b/test/functional/sqlsrv/TC42_FetchField.phpt
@@ -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)
diff --git a/test/functional/sqlsrv/TC43_FetchData.phpt b/test/functional/sqlsrv/TC43_FetchData.phpt
index 6e8e60f3..adeec7d2 100644
--- a/test/functional/sqlsrv/TC43_FetchData.phpt
+++ b/test/functional/sqlsrv/TC43_FetchData.phpt
@@ -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)
diff --git a/test/functional/sqlsrv/TC44_FetchArray.phpt b/test/functional/sqlsrv/TC44_FetchArray.phpt
index ab7e88c8..217c6e1a 100644
--- a/test/functional/sqlsrv/TC44_FetchArray.phpt
+++ b/test/functional/sqlsrv/TC44_FetchArray.phpt
@@ -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)
diff --git a/test/functional/sqlsrv/TC45_FetchObject.phpt b/test/functional/sqlsrv/TC45_FetchObject.phpt
index 588620c5..dc138cb7 100644
--- a/test/functional/sqlsrv/TC45_FetchObject.phpt
+++ b/test/functional/sqlsrv/TC45_FetchObject.phpt
@@ -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)
diff --git a/test/functional/sqlsrv/TC46_FetchNextResult.phpt b/test/functional/sqlsrv/TC46_FetchNextResult.phpt
index 58d8fdfa..05f83552 100644
--- a/test/functional/sqlsrv/TC46_FetchNextResult.phpt
+++ b/test/functional/sqlsrv/TC46_FetchNextResult.phpt
@@ -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)
diff --git a/test/functional/sqlsrv/TC48_FetchScrollable.phpt b/test/functional/sqlsrv/TC48_FetchScrollable.phpt
index b8b32a5b..9019d03b 100644
--- a/test/functional/sqlsrv/TC48_FetchScrollable.phpt
+++ b/test/functional/sqlsrv/TC48_FetchScrollable.phpt
@@ -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)
diff --git a/test/functional/sqlsrv/TC51_StreamRead.phpt b/test/functional/sqlsrv/TC51_StreamRead.phpt
index 4d6e79bc..5ac598a3 100644
--- a/test/functional/sqlsrv/TC51_StreamRead.phpt
+++ b/test/functional/sqlsrv/TC51_StreamRead.phpt
@@ -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";
 
diff --git a/test/functional/sqlsrv/TC55_StreamScrollable.phpt b/test/functional/sqlsrv/TC55_StreamScrollable.phpt
index 6df4f3a7..0965c6d0 100644
--- a/test/functional/sqlsrv/TC55_StreamScrollable.phpt
+++ b/test/functional/sqlsrv/TC55_StreamScrollable.phpt
@@ -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
diff --git a/test/functional/sqlsrv/test_stream_large_data.phpt b/test/functional/sqlsrv/test_stream_large_data.phpt
index 1cf59696..b7db404a 100644
--- a/test/functional/sqlsrv/test_stream_large_data.phpt
+++ b/test/functional/sqlsrv/test_stream_large_data.phpt
@@ -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()) {