Added skipif and modified the check of isLocaleSupported()
This commit is contained in:
parent
720346f459
commit
6b209526cd
|
@ -98,6 +98,8 @@ function startTest($testName)
|
||||||
*/
|
*/
|
||||||
function endTest($testName)
|
function endTest($testName)
|
||||||
{
|
{
|
||||||
|
// reset the utf-8 flag
|
||||||
|
setUTF8Data(false);
|
||||||
echo "Test \"$testName\" completed successfully.\n";
|
echo "Test \"$testName\" completed successfully.\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,18 +6,25 @@ Validates that a prepared statement can be successfully executed more than once.
|
||||||
--ENV--
|
--ENV--
|
||||||
PHPT_EXEC=true
|
PHPT_EXEC=true
|
||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php require('skipif_versions_old.inc'); ?>
|
<?php
|
||||||
|
// locale must be set before 1st connection
|
||||||
|
if (!isWindows()) {
|
||||||
|
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
||||||
|
}
|
||||||
|
require('skipif_versions_old.inc');
|
||||||
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
require_once('MsCommon.inc');
|
require_once('MsCommon.inc');
|
||||||
|
|
||||||
function prepareAndExecute($noPasses)
|
function prepareAndExecute($noPasses)
|
||||||
{
|
{
|
||||||
$testName = "Statement - Prepare and Execute";
|
|
||||||
startTest($testName);
|
|
||||||
|
|
||||||
setup();
|
setup();
|
||||||
$conn1 = AE\connect();
|
if (useUTF8Data()) {
|
||||||
|
$conn1 = AE\connect(array('CharacterSet'=>'UTF-8'));
|
||||||
|
} else {
|
||||||
|
$conn1 = AE\connect();
|
||||||
|
}
|
||||||
|
|
||||||
$tableName = 'TC34test';
|
$tableName = 'TC34test';
|
||||||
AE\createTestTable($conn1, $tableName);
|
AE\createTestTable($conn1, $tableName);
|
||||||
|
@ -80,20 +87,38 @@ function prepareAndExecute($noPasses)
|
||||||
dropTable($conn1, $tableName);
|
dropTable($conn1, $tableName);
|
||||||
|
|
||||||
sqlsrv_close($conn1);
|
sqlsrv_close($conn1);
|
||||||
|
|
||||||
endTest($testName);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// locale must be set before 1st connection
|
||||||
if (!isWindows()) {
|
if (!isWindows()) {
|
||||||
setUTF8Data(true);
|
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$testName = "Statement - Prepare and Execute";
|
||||||
|
|
||||||
|
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)
|
||||||
|
startTest($testName);
|
||||||
|
if (isLocaleSupported()) {
|
||||||
|
try {
|
||||||
|
setUTF8Data(false);
|
||||||
|
prepareAndExecute(5);
|
||||||
|
} catch (Exception $e) {
|
||||||
|
echo $e->getMessage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
endTest($testName);
|
||||||
|
|
||||||
|
// test utf8
|
||||||
|
startTest($testName);
|
||||||
try {
|
try {
|
||||||
|
setUTF8Data(true);
|
||||||
prepareAndExecute(5);
|
prepareAndExecute(5);
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
echo $e->getMessage();
|
echo $e->getMessage();
|
||||||
}
|
}
|
||||||
setUTF8Data(false);
|
endTest($testName);
|
||||||
|
|
||||||
?>
|
?>
|
||||||
--EXPECT--
|
--EXPECT--
|
||||||
Test "Statement - Prepare and Execute" completed successfully.
|
Test "Statement - Prepare and Execute" completed successfully.
|
||||||
|
Test "Statement - Prepare and Execute" completed successfully.
|
||||||
|
|
|
@ -8,10 +8,10 @@ PHPT_EXEC=true
|
||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
// locale must be set before 1st connection
|
// locale must be set before 1st connection
|
||||||
if ( !isWindows() ) {
|
if (!isWindows()) {
|
||||||
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
||||||
}
|
}
|
||||||
require('skipif_versions_old.inc');
|
require('skipif_versions_old.inc');
|
||||||
?>
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
|
|
@ -5,9 +5,10 @@ PHPT_EXEC=true
|
||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?
|
<?
|
||||||
// locale must be set before 1st connection
|
// locale must be set before 1st connection
|
||||||
if ( !isWindows() ) {
|
if (!isWindows()) {
|
||||||
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
||||||
}
|
}
|
||||||
|
require('skipif_versions_old.inc');
|
||||||
?>
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
@ -104,7 +105,7 @@ $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)
|
||||||
startTest($testName);
|
startTest($testName);
|
||||||
if (isWindows() || isLocaleSupported()) {
|
if (isLocaleSupported()) {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
setUTF8Data(false);
|
setUTF8Data(false);
|
||||||
|
|
|
@ -8,9 +8,10 @@ PHPT_EXEC=true
|
||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?
|
<?
|
||||||
// locale must be set before 1st connection
|
// locale must be set before 1st connection
|
||||||
if ( !isWindows() ) {
|
if (!isWindows()) {
|
||||||
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
||||||
}
|
}
|
||||||
|
require('skipif_versions_old.inc');
|
||||||
?>
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
@ -161,7 +162,7 @@ $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)
|
||||||
startTest($testName);
|
startTest($testName);
|
||||||
if (isWindows() || isLocaleSupported()) {
|
if (isLocaleSupported()) {
|
||||||
try {
|
try {
|
||||||
setUTF8Data(false);
|
setUTF8Data(false);
|
||||||
fetchRow(1, 4);
|
fetchRow(1, 4);
|
||||||
|
|
|
@ -10,7 +10,7 @@ PHPT_EXEC=true
|
||||||
if (!isWindows()) {
|
if (!isWindows()) {
|
||||||
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
||||||
}
|
}
|
||||||
require('skipif_versions_old.inc');
|
require('skipif_versions_old.inc');
|
||||||
?>
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
@ -28,7 +28,7 @@ function fetchRow($minFetchMode, $maxFetchMode)
|
||||||
setup();
|
setup();
|
||||||
$tableName = 'TC45test';
|
$tableName = 'TC45test';
|
||||||
if (useUTF8Data()) {
|
if (useUTF8Data()) {
|
||||||
$conn1 = AE\connect(array( 'CharacterSet'=>'UTF-8' ));
|
$conn1 = AE\connect(array('CharacterSet'=>'UTF-8'));
|
||||||
} else {
|
} else {
|
||||||
$conn1 = AE\connect();
|
$conn1 = AE\connect();
|
||||||
}
|
}
|
||||||
|
@ -89,7 +89,7 @@ function fetchObject($stmt, $rows, $fields, $useClass)
|
||||||
$obj = sqlsrv_fetch_object($stmt);
|
$obj = sqlsrv_fetch_object($stmt);
|
||||||
}
|
}
|
||||||
if ($obj === false) {
|
if ($obj === false) {
|
||||||
fatalError("Row $i is missing");
|
fatalError("In fetchObject: Row $i is missing");
|
||||||
}
|
}
|
||||||
$values[$i] = $obj;
|
$values[$i] = $obj;
|
||||||
}
|
}
|
||||||
|
@ -103,7 +103,7 @@ function fetchArray($stmt, $rows, $fields)
|
||||||
for ($i = 0; $i < $rows; $i++) {
|
for ($i = 0; $i < $rows; $i++) {
|
||||||
$row = sqlsrv_fetch_array($stmt);
|
$row = sqlsrv_fetch_array($stmt);
|
||||||
if ($row === false) {
|
if ($row === false) {
|
||||||
fatalError("Row $i is missing");
|
fatalError("In fetchArray: Row $i is missing");
|
||||||
}
|
}
|
||||||
$values[$i] = $row;
|
$values[$i] = $row;
|
||||||
}
|
}
|
||||||
|
@ -127,7 +127,13 @@ function checkData($rows, $fields, $actualValues, $expectedValues)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// locale must be set before 1st connection
|
||||||
|
if (!isWindows()) {
|
||||||
|
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
||||||
|
}
|
||||||
|
|
||||||
$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)
|
||||||
startTest($testName);
|
startTest($testName);
|
||||||
if (isLocaleSupported()) {
|
if (isLocaleSupported()) {
|
||||||
|
|
|
@ -7,9 +7,10 @@ PHPT_EXEC=true
|
||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?
|
<?
|
||||||
// locale must be set before 1st connection
|
// locale must be set before 1st connection
|
||||||
if ( !isWindows() ) {
|
if (!isWindows()) {
|
||||||
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
||||||
}
|
}
|
||||||
|
require('skipif_versions_old.inc');
|
||||||
?>
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
@ -94,7 +95,7 @@ $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)
|
||||||
startTest($testName);
|
startTest($testName);
|
||||||
if (isWindows() || isLocaleSupported()) {
|
if (isLocaleSupported()) {
|
||||||
try {
|
try {
|
||||||
setUTF8Data(false);
|
setUTF8Data(false);
|
||||||
fetchFields();
|
fetchFields();
|
||||||
|
|
|
@ -7,9 +7,10 @@ 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
|
||||||
if ( !isWindows() ) {
|
if (!isWindows()) {
|
||||||
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
||||||
}
|
}
|
||||||
|
require('skipif_versions_old.inc');
|
||||||
?>
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
@ -138,7 +139,7 @@ $errMessage = 'Connection with Column Encryption enabled does not support fetchi
|
||||||
|
|
||||||
// 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)
|
||||||
startTest($testName);
|
startTest($testName);
|
||||||
if (isWindows() || isLocaleSupported()) {
|
if (isLocaleSupported()) {
|
||||||
try {
|
try {
|
||||||
setUTF8Data(false);
|
setUTF8Data(false);
|
||||||
streamRead(20, 1);
|
streamRead(20, 1);
|
||||||
|
|
|
@ -7,9 +7,10 @@ PHPT_EXEC=true
|
||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?
|
<?
|
||||||
// locale must be set before 1st connection
|
// locale must be set before 1st connection
|
||||||
if ( !isWindows() ) {
|
if (!isWindows()) {
|
||||||
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
||||||
}
|
}
|
||||||
|
require('skipif_versions_old.inc');
|
||||||
?>
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
@ -175,7 +176,7 @@ $errMessage = 'Connection with Column Encryption enabled does not support fetchi
|
||||||
|
|
||||||
// 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)
|
||||||
startTest($testName);
|
startTest($testName);
|
||||||
if (isWindows() || isLocaleSupported()) {
|
if (isLocaleSupported()) {
|
||||||
try {
|
try {
|
||||||
setUTF8Data(false);
|
setUTF8Data(false);
|
||||||
streamScroll(20, 1);
|
streamScroll(20, 1);
|
||||||
|
|
|
@ -3,11 +3,11 @@ 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
|
||||||
if ( !isWindows() ) {
|
if (!isWindows() ) {
|
||||||
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
setlocale(LC_ALL, "en_US.ISO-8859-1");
|
||||||
}
|
}
|
||||||
|
|
||||||
php require('skipif.inc');
|
require('skipif.inc');
|
||||||
?>
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
@ -259,7 +259,7 @@ if (!isWindows()) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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 (isWindows() || isLocaleSupported()) {
|
if (isLocaleSupported()) {
|
||||||
setUTF8Data(false);
|
setUTF8Data(false);
|
||||||
runtest();
|
runtest();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue