diff options
| author | Anatol Belski <ab@php.net> | 2016-12-19 01:10:58 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-12-19 01:10:58 +0100 |
| commit | 057ab8da76344f73ac0a8503d9a1f6a7e72c7c27 (patch) | |
| tree | dbbd0419734b67d99374782d4d14661e76f2a24a /ext/pdo/tests | |
| parent | c8038d0611d063b3e165b42fefb4a2631d03b5a2 (diff) | |
| parent | 8adc86a698ba6b56d6b09bb9b7d378c4a126cf0c (diff) | |
| download | php-git-057ab8da76344f73ac0a8503d9a1f6a7e72c7c27.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
update NEWS
Compatibility with Firebird & Oracle select syntax.
Diffstat (limited to 'ext/pdo/tests')
| -rw-r--r-- | ext/pdo/tests/bug_60665.phpt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/pdo/tests/bug_60665.phpt b/ext/pdo/tests/bug_60665.phpt index 28c1482154..bae3d603d7 100644 --- a/ext/pdo/tests/bug_60665.phpt +++ b/ext/pdo/tests/bug_60665.phpt @@ -13,8 +13,12 @@ PDOTest::skip(); if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $db = PDOTest::factory(); - -$statement = $db->prepare("SELECT NULL AS null_value, 0 AS zero, 1 AS one"); +switch ($db->getAttribute(PDO::ATTR_DRIVER_NAME)) { + case 'oci': $from = 'from dual'; break; + case 'firebird': $from = 'from rdb$database'; break; + default: $from = ''; break; +} +$statement = $db->prepare("SELECT NULL AS null_value, 0 AS zero, 1 AS one $from"); $statement->execute(); $row = $statement->fetch(PDO::FETCH_LAZY); var_dump( |