diff options
author | Anatol Belski <ab@php.net> | 2016-12-19 01:08:44 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2016-12-19 01:08:44 +0100 |
commit | 8adc86a698ba6b56d6b09bb9b7d378c4a126cf0c (patch) | |
tree | 9b645e556a497b69275cbb14a4fb848620811de3 /ext/pdo | |
parent | 7ef2e9019769c870e9e81bff957203963114f2ed (diff) | |
parent | 9fb8ea58b59fe742c7c21de1b3878edb560db534 (diff) | |
download | php-git-8adc86a698ba6b56d6b09bb9b7d378c4a126cf0c.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Compatibility with Firebird & Oracle select syntax.
Diffstat (limited to 'ext/pdo')
-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( |