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

Merge pull request #627 from v-kaywon/fixPDOTests2

Browse source 
fix AE related tests
This commit is contained in:
Yuki Wong 2017-12-13 10:17:15 -08:00 committed by GitHub
parent ed7db09c46 bc9ca5e486
commit ef3601428b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/functional/pdo_sqlsrv/pdo_errorinfo_emulateprepare.phpt
View file

@ -20,7 +20,7 @@ try {
echo "\n****testing with emulate prepare****\n";
// Do not support emulate prepare with Always Encrypted
if (!isColEncrypted()) {
if (!isAEConnected()) {
$stmt = $conn->prepare("SELECT c2 FROM $tbname WHERE c1= :int", array(PDO::ATTR_EMULATE_PREPARES => true));
} else {
$stmt = $conn->prepare("SELECT c2 FROM $tbname WHERE c1= :int");
@ -32,7 +32,7 @@ try {
$stmt->execute();
$stmt_error = $stmt->errorInfo();
if (!isColEncrypted()) {
if (!isAEConnected()) {
if ($stmt_error[0] != "HY093") {
echo "SQLSTATE should be HY093 when Emulate Prepare is true.\n";
print_r($stmt_error);

10
test/functional/pdo_sqlsrv/pdo_param_output_variants.phpt
View file

@ -22,7 +22,7 @@ function testReverse($conn)
$stmt->execute();
// Connection with Column Encryption enabled works for non encrypted SQL_VARIANT
// Since SQLDescribeParam is called
if (isColEncrypted() && $string === "987654321") {
if (isAEConnected() && $string === "987654321") {
echo "Testing input output parameter with SQL_VARIANT is successful.\n";
} else {
@ -31,7 +31,7 @@ function testReverse($conn)
} catch (Exception $e) {
//echo "Failed when calling the reverse procedure\n";
$error = $e->getMessage();
if (!isColEncrypted() && strpos($error, "Implicit conversion from data type sql_variant to nvarchar is not allowed.") !== false) {
if (!isAEConnected() && strpos($error, "Implicit conversion from data type sql_variant to nvarchar is not allowed.") !== false) {
echo "Testing input output parameter with SQL_VARIANT is successful.\n";
} else {
echo "$error\n";
@ -47,7 +47,7 @@ function createVariantTable($conn, $tableName)
echo $e->getMessage();
}
$data = "This is to test if sql_variant works with output parameters";
if (!isColEncrypted()) {
if (!isAEConnected()) {
$tsql = "INSERT INTO [$tableName] ([c1_int], [c2_variant]) VALUES (1, ?)";
$stmt = $conn->prepare($tsql);
$result = $stmt->execute(array($data));
@ -78,7 +78,7 @@ function testOutputParam($conn, $tableName)
$stmt->bindValue(1, 1);
$stmt->bindParam(2, $callResult, PDO::PARAM_STR, 100);
$stmt->execute();
if (isColEncrypted() && $callResult === "This is to test if sql_variant works with output parameters") {
if (isAEConnected() && $callResult === "This is to test if sql_variant works with output parameters") {
echo "Testing output parameter with SQL_VARIANT is successful.\n";
} else {
echo "Does SELECT from table work? $callResult \n";
@ -88,7 +88,7 @@ function testOutputParam($conn, $tableName)
echo "initialized data and result should be the same";
}
$error = $e->getMessage();
if (!isColEncrypted() && strpos($error, "Operand type clash: nvarchar(max) is incompatible with sql_variant") !== false) {
if (!isAEConnected() && strpos($error, "Operand type clash: nvarchar(max) is incompatible with sql_variant") !== false) {
echo "Testing output parameter with SQL_VARIANT is successful.\n";
} else {
echo "$error\n";