From 2f8b9c2acc42174445c6319e2a2639fb01aa2942 Mon Sep 17 00:00:00 2001 From: Jenny Tam Date: Wed, 11 Apr 2018 16:25:00 -0700 Subject: [PATCH 1/2] Fix bigint output param test --- test/functional/sqlsrv/sqlsrv_bigint_outparam.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/sqlsrv/sqlsrv_bigint_outparam.phpt b/test/functional/sqlsrv/sqlsrv_bigint_outparam.phpt index 83239cd7..d5bf20c7 100644 --- a/test/functional/sqlsrv/sqlsrv_bigint_outparam.phpt +++ b/test/functional/sqlsrv/sqlsrv_bigint_outparam.phpt @@ -33,7 +33,7 @@ printf("\n"); // Call stored procedure with SQLSRV_PARAM_INOUT $bigintOut = 0; -$stmt = sqlsrv_prepare($conn, $outSql, array(array(&$bigintOut, SQLSRV_PARAM_INOUT, null, SQLSRV_SQLTYPE_VARCHAR(32)))); +$stmt = sqlsrv_prepare($conn, $outSql, array(array(&$bigintOut, SQLSRV_PARAM_INOUT, null, SQLSRV_SQLTYPE_BIGINT))); sqlsrv_execute($stmt); printf("Large bigint inout:\n"); var_dump($bigintOut); From b8d1feb9bac0024299dccd4c065f349cdfb14059 Mon Sep 17 00:00:00 2001 From: Jenny Tam Date: Thu, 12 Apr 2018 08:41:35 -0700 Subject: [PATCH 2/2] Modified the driver tests as well --- test/functional/pdo_sqlsrv/pdo_connect_driver.phpt | 3 +-- test/functional/sqlsrv/sqlsrv_connect_driver.phpt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/functional/pdo_sqlsrv/pdo_connect_driver.phpt b/test/functional/pdo_sqlsrv/pdo_connect_driver.phpt index 34186baf..4a934755 100644 --- a/test/functional/pdo_sqlsrv/pdo_connect_driver.phpt +++ b/test/functional/pdo_sqlsrv/pdo_connect_driver.phpt @@ -122,8 +122,7 @@ function testWrongODBC() { global $msodbcsqlMaj; - // TODO: this will change once ODBC 17 is officially released - $value = "ODBC Driver 17 for SQL Server"; + $value = "ODBC Driver 11 for SQL Server"; if ($msodbcsqlMaj == 17 || $msodbcsqlMaj < 13) { $value = "ODBC Driver 13 for SQL Server"; } diff --git a/test/functional/sqlsrv/sqlsrv_connect_driver.phpt b/test/functional/sqlsrv/sqlsrv_connect_driver.phpt index 4f878bea..90e5b995 100644 --- a/test/functional/sqlsrv/sqlsrv_connect_driver.phpt +++ b/test/functional/sqlsrv/sqlsrv_connect_driver.phpt @@ -117,8 +117,7 @@ function testEncryptedWithODBC($msodbcsqlMaj, $server, $connectionOptions) function testWrongODBC($msodbcsqlMaj, $server, $connectionOptions) { - // TODO: this will change once ODBC 17 is officially released - $value = "ODBC Driver 17 for SQL Server"; + $value = "ODBC Driver 11 for SQL Server"; if ($msodbcsqlMaj == 17 || $msodbcsqlMaj < 13) { $value = "ODBC Driver 13 for SQL Server"; }