com php-src: Fix ODBC bug for varchars returning with length zero: ext/pdo_odbc/odbc_stmt.c ext/pdo_odbc/tests/max_col umns.phpt

From: Date: Fri, 01 Apr 2016 15:11:58 +0000
Subject: com php-src: Fix ODBC bug for varchars returning with length zero: ext/pdo_odbc/odbc_stmt.c ext/pdo_odbc/tests/max_col umns.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-91580@lists.php.net to get a copy of this message
Commit: 4df5f79ab52813d3d3d36737628a4f14384c0fa8 Author: Elizabeth Marie Smith <auroraeosrose@gmail.com> Thu, 14 Jan 2016 13:19:20 +0100 Committer: Anatol Belski <ab@php.net> Fri, 1 Apr 2016 17:11:58 +0200 Parents: 5b1bb41c0b125fe9964abaa1d523ce2ba1823cf6 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4df5f79ab52813d3d3d36737628a4f14384c0fa8 Log: Fix ODBC bug for varchars returning with length zero Changed paths: M ext/pdo_odbc/odbc_stmt.c A ext/pdo_odbc/tests/max_columns.phpt Diff: diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c index 6233e63..904c345 100644 --- a/ext/pdo_odbc/odbc_stmt.c +++ b/ext/pdo_odbc/odbc_stmt.c @@ -574,6 +574,24 @@ static int odbc_stmt_describe(pdo_stmt_t *stmt, int colno) sizeof(S->cols[colno].colname)-1, &colnamelen, &S->cols[colno].coltype, &colsize, NULL, NULL); + /* This fixes a known issue with SQL Server and (max) lengths, + may affect others as well. If we are SQL_VARCHAR, + SQL_VARBINARY, or SQL_WVARCHAR (or any of the long variations) + and zero is returned from colsize then consider it long */ + if (0 == colsize && + (S->cols[colno].coltype == SQL_VARCHAR || + S->cols[colno].coltype == SQL_LONGVARCHAR || +#ifdef SQL_WVARCHAR + S->cols[colno].coltype == SQL_WVARCHAR || +#endif +#ifdef SQL_WLONGVARCHAR + S->cols[colno].coltype == SQL_WLONGVARCHAR || +#endif + S->cols[colno].coltype == SQL_VARBINARY || + S->cols[colno].coltype == SQL_LONGVARBINARY)) { + S->going_long = 1; + } + if (rc != SQL_SUCCESS) { pdo_odbc_stmt_error("SQLDescribeCol"); if (rc != SQL_SUCCESS_WITH_INFO) { diff --git a/ext/pdo_odbc/tests/max_columns.phpt b/ext/pdo_odbc/tests/max_columns.phpt new file mode 100644 index 0000000..301fa76 --- /dev/null +++ b/ext/pdo_odbc/tests/max_columns.phpt @@ -0,0 +1,46 @@ +--TEST-- +PDO ODBC varying character with max/no length +--SKIPIF-- +<?php # vim:ft=php +if (!extension_loaded('pdo_odbc')) print 'skip not loaded'; +?> +--FILE-- +<?php +require 'ext/pdo/tests/pdo_test.inc'; +$db = PDOTest::test_factory('ext/pdo_odbc/tests/common.phpt'); +$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT); + +if (false === $db->exec('CREATE TABLE TEST (id INT NOT NULL PRIMARY KEY, data varchar(max))')) { + if (false === $db->exec('CREATE TABLE TEST (id INT NOT NULL PRIMARY KEY, data longtext)')) { + if (false === $db->exec('CREATE TABLE TEST (id INT NOT NULL PRIMARY KEY, data CLOB)')) { + die("BORK: don't know how to create a long column here:\n" . implode(", ", $db->errorInfo())); + } + } +} + +$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + +$sizes = array(32, 64, 128, 253, 254, 255, 256, 257, 258, 512, 1024, 2048, 3998, 3999, 4000); + +$db->beginTransaction(); +$insert = $db->prepare('INSERT INTO TEST VALUES (?, ?)'); +foreach ($sizes as $num) { + $insert->execute(array($num, str_repeat('i', $num))); +} +$insert = null; +$db->commit(); + +foreach ($db->query('SELECT id, data from TEST') as $row) { + $expect = str_repeat('i', $row[0]); + if (strcmp($expect, $row[1])) { + echo "Failed on size $row[id]:\n"; + printf("Expected %d bytes, got %d\n", strlen($expect), strlen($row['data'])); + echo bin2hex($expect) . "\n"; + echo bin2hex($row['data']) . "\n"; + } +} + +echo "Finished\n"; + +--EXPECT-- +Finished

« previous php.cvs (#91580) next »