From: Anatol Belski <ab@php.net>
Date: Tue, 2 Jan 2018 10:39:09 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.2RC1~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08d06f7d4f1834a505f329ef3464c44431462ff8;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix test for pdo_odbc
---

08d06f7d4f1834a505f329ef3464c44431462ff8
diff --cc ext/pdo/tests/bug_65946.phpt
index 76a4e8db89,0c9d6ac00b..9318428910
--- a/ext/pdo/tests/bug_65946.phpt
+++ b/ext/pdo/tests/bug_65946.phpt
@@@ -18,8 -18,13 +18,11 @@@ $db->exec('CREATE TABLE test(id int)')
  $db->exec('INSERT INTO test VALUES(1)');
  switch ($db->getAttribute(PDO::ATTR_DRIVER_NAME)) {
  	case 'dblib':
 -		// if :limit is used, the value will be quoted as '1', which is invalid syntax
 -		// this is a bug, to be addressed separately from adding these tests to pdo_dblib
 -		$sql = 'SELECT TOP 1 * FROM test';
 +		$sql = 'SELECT TOP :limit * FROM test';
  		break;
+ 	case 'odbc':
+ 		$sql = 'SELECT TOP (:limit) * FROM test';
+ 		break;
  	case 'firebird':
  		$sql = 'SELECT FIRST :limit * FROM test';
  		break;