From b65d34fb237cc561cde314ad618aabbbaace0b8f Mon Sep 17 00:00:00 2001 From: v-kaywon Date: Fri, 9 Mar 2018 17:42:43 -0800 Subject: [PATCH] fix char and nchar tests --- .../sqlsrv/sqlsrv_ae_output_param_sqltype_char_size.phpt | 2 +- .../sqlsrv/sqlsrv_ae_output_param_sqltype_nchar_size.phpt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/functional/sqlsrv/sqlsrv_ae_output_param_sqltype_char_size.phpt b/test/functional/sqlsrv/sqlsrv_ae_output_param_sqltype_char_size.phpt index b17def17..a27335fa 100644 --- a/test/functional/sqlsrv/sqlsrv_ae_output_param_sqltype_char_size.phpt +++ b/test/functional/sqlsrv/sqlsrv_ae_output_param_sqltype_char_size.phpt @@ -83,7 +83,7 @@ foreach($dataTypes as $dataType) { } } } else { - if (strpos($sqltypeFull, "VARCHAR") !== false && $dataType == "char" && $m > $n && strpos($sqltypeFull, "max") === false) { + if (strpos($sqltypeFull, "VARCHAR") !== false && $dataType == "char" && $m > $n && strpos($sqltypeFull, "max") === false && $dir == "SQLSRV_PARAM_OUT") { if ($r !== false) { echo "Conversions from $typeFull to output $sqltypeFull should not be supported\n"; } diff --git a/test/functional/sqlsrv/sqlsrv_ae_output_param_sqltype_nchar_size.phpt b/test/functional/sqlsrv/sqlsrv_ae_output_param_sqltype_nchar_size.phpt index a76a0d12..3ab7b31c 100644 --- a/test/functional/sqlsrv/sqlsrv_ae_output_param_sqltype_nchar_size.phpt +++ b/test/functional/sqlsrv/sqlsrv_ae_output_param_sqltype_nchar_size.phpt @@ -83,7 +83,7 @@ foreach($dataTypes as $dataType) { } } } else { - if (strpos($sqltypeFull, "NVARCHAR") !== false && $dataType == "nchar" && $m > $n && strpos($sqltypeFull, "max") === false) { + if (strpos($sqltypeFull, "NVARCHAR") !== false && $dataType == "nchar" && $m > $n && strpos($sqltypeFull, "max") === false && $dir == "SQLSRV_PARAM_OUT") { if ($r !== false) { echo "Conversions from $typeFull to output $sqltypeFull should not be supported\n"; }