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

apply review comments 2

Browse source
This commit is contained in:
v-kaywon 2017-12-07 14:10:10 -08:00
parent 98d7307860
commit c5d02cbeec
6 changed files with 20 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc
View file

@ -185,7 +185,7 @@ class ColumnMeta
$append = " ";
// an identity column is not encrypted because a select query with identity column as the where clause is often run and the user want to have to bind parameter every time
if (isColEncrypted() && ($this->encType == "deterministic" || $this->encType == "ramdomized") && $this->isEncryptableType()
if (isColEncrypted() && ($this->encType == "deterministic" || $this->encType == "randomized") && $this->isEncryptableType()
&& stripos($this->options, "identity") === false && stripos($this->options, "rowguidcol") === false) {
$cekName = getCekName();
if (stripos($this->dataType, "char") !== false) {

31
test/functional/pdo_sqlsrv/PDO38_FetchBound.phpt
View file

@ -69,14 +69,9 @@ try {
$stmt1->bindColumn('idx', $idx);
$stmt1->bindColumn('txt', $txt);
$stmt1->execute();
$boundCols = array();
while ($stmt1->fetch(PDO::FETCH_BOUND)) {
$boundCols[$idx] = $txt;
var_dump(array($idx=>$txt));
}
if (isColEncrypted()) {
ksort($boundCols);
}
var_dump($boundCols);
echo "===ALONE===\n";
@ -127,14 +122,9 @@ try {
$stmt1->bindColumn('idx', $col);
$stmt1->bindColumn('txt', $col);
$stmt1->execute();
$cols = array();
while ($stmt1->fetch(PDO::FETCH_BOUND)) {
array_push($cols, $col);
var_dump($col);
}
if (isColEncrypted()) {
sort($cols);
}
var_dump($cols);
// Cleanup
dropTable($conn1, $tableName);
@ -159,11 +149,15 @@ array(3) {
string(7) "String2"
}
===WHILE===
array(3) {
array(1) {
[0]=>
string(7) "String0"
}
array(1) {
[1]=>
string(7) "String1"
}
array(1) {
[2]=>
string(7) "String2"
}
@ -236,11 +230,6 @@ bool(true)
bool(true)
string(1) "2"
===REBIND/CONFLICT===
array(3) {
[0]=>
string(7) "String0"
[1]=>
string(7) "String1"
[2]=>
string(7) "String2"
}
string(7) "String0"
string(7) "String1"
string(7) "String2"

1
test/functional/pdo_sqlsrv/pdo_katmai_special_types.phpt
View file

@ -106,6 +106,7 @@ function katmaiSparseChar($conn)
if ($input !== trim($value1)) {
echo "The value is unexpected!\n";
}
// trimming it required since SPARSE is not supported for encrypted columns
if (trim($value1) !== trim($value2)) {
echo "The values don't match!\n";
}

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

@ -5,11 +5,9 @@ Since output param is not supported for sql_variant columns, this test verifies
--FILE--
<?php
require_once("MsCommon_mid-refactor.inc");
function testReverse($conn)
{
$procName = getProcName('sqlReverse');
try {
$spCode = "CREATE PROC [$procName] @string AS SQL_VARIANT OUTPUT as SELECT @string = REVERSE(CAST(@string AS varchar(30)))";
$conn->exec($spCode);
@ -17,7 +15,6 @@ function testReverse($conn)
echo "Failed to create the reverse procedure\n";
echo $e->getMessage();
}
try {
$stmt = $conn->prepare("{ CALL [$procName] (?) }");
$string = "123456789";
@ -26,7 +23,7 @@ function testReverse($conn)
// Connection with Column Encryption enabled works for non encrypted SQL_VARIANT
// Since SQLDescribeParam is called
if (isColEncrypted() && $string === "987654321") {
echo "Test input output parameter with SQL_VARIANT successfully.\n";
echo "Testing input output parameter with SQL_VARIANT is successful.\n";
} else {
echo "Does REVERSE work? $string \n";
@ -35,13 +32,12 @@ function testReverse($conn)
//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) {
echo "Test input output parameter with SQL_VARIANT successfully.\n";
echo "Testing input output parameter with SQL_VARIANT is successful.\n";
} else {
echo "$error\n";
}
}
}
function createVariantTable($conn, $tableName)
{
try {
@ -50,7 +46,6 @@ function createVariantTable($conn, $tableName)
echo "Failed to create a test table\n";
echo $e->getMessage();
}
$data = "This is to test if sql_variant works with output parameters";
if (!isColEncrypted()) {
$tsql = "INSERT INTO [$tableName] ([c1_int], [c2_variant]) VALUES (1, ?)";
@ -62,36 +57,29 @@ function createVariantTable($conn, $tableName)
$intData = 1;
$result = $stmt->execute(array($intData, $data));
}
if (! $result) {
echo "Failed to insert data\n";
}
}
function testOutputParam($conn, $tableName)
{
// First, create a temporary stored procedure
$procName = getProcName('sqlVariant');
$spArgs = "@p1 int, @p2 sql_variant OUTPUT";
$spCode = "SET @p2 = ( SELECT [c2_variant] FROM $tableName WHERE [c1_int] = @p1 )";
$conn->exec("CREATE PROC [$procName] ($spArgs) AS BEGIN $spCode END");
$callArgs = "?, ?";
// Data to initialize $callResult variable. This variable should be different from
// the inserted data in the table
$initData = "A short text";
$callResult = $initData;
try {
$stmt = $conn->prepare("{ CALL [$procName] ($callArgs)}");
$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") {
echo "Test output parameter with SQL_VARIANT successfully.\n";
echo "Testing output parameter with SQL_VARIANT is successful.\n";
} else {
echo "Does SELECT from table work? $callResult \n";
}
@ -101,26 +89,21 @@ function testOutputParam($conn, $tableName)
}
$error = $e->getMessage();
if (!isColEncrypted() && strpos($error, "Operand type clash: nvarchar(max) is incompatible with sql_variant") !== false) {
echo "Test output parameter with SQL_VARIANT successfully.\n";
echo "Testing output parameter with SQL_VARIANT is successful.\n";
} else {
echo "$error\n";
}
}
}
try {
// Connect
$conn = connect();
// Test with a simple stored procedure
testReverse($conn);
// Now test with another stored procedure
$tableName = getTableName();
createVariantTable($conn, $tableName);
testOutputParam($conn, $tableName);
$conn = null;
} catch (Exception $e) {
echo $e->getMessage();
@ -128,5 +111,5 @@ try {
?>
--EXPECT--
Test input output parameter with SQL_VARIANT successfully.
Test output parameter with SQL_VARIANT successfully.
Testing input output parameter with SQL_VARIANT is successful.
Testing output parameter with SQL_VARIANT is successful.

1
test/functional/pdo_sqlsrv/pdo_simple_update_variants.phpt
View file

@ -82,7 +82,6 @@ function fetchRows($conn, $tableName)
$stmt = $conn->query($query);
$stmt->setFetchMode(PDO::FETCH_CLASS, 'Food');
$foodArray = array();
while ($food = $stmt->fetch()) {
echo "ID: " . $food->id . " ";
echo $food->getFood() . ", ";

5
test/functional/pdo_sqlsrv/pdostatement_fetchmode_emulate_prepare.phpt
View file

@ -1,7 +1,7 @@
--TEST--
PDO Fetch Mode Test with emulate prepare
--DESCRIPTION--
Basic verification for "PDOStatement::setFetchMode()<29>.
Basic verification for PDOStatement::setFetchMode.
--ENV--
PHPT_EXEC=true
--SKIPIF--
@ -93,7 +93,6 @@ try {
$assocArr['Label'] = $resultset[0]['Label'];
$assocArr['Budget'] = $resultset[0]['Budget'];
var_dump($assocArr);
//print "$resultset[1][1]\n";
print($resultset[1][1] . "\n");
print($resultset[4][3] . "\n");
print_r($resultset[3]);
@ -178,7 +177,7 @@ try {
var_dump($metadata);
// Cleanup
DropTable($conn1, $tableName);
dropTable($conn1, $tableName);
unset($stmt1);
unset($stmt2);
unset($stmt3);