felipe                                   Fri, 03 Dec 2010 22:58:21 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=305958

Log:
- Fixed test

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_43139.phpt
    U   php/php-src/trunk/ext/pdo/tests/bug_43139.phpt

Modified: php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_43139.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_43139.phpt   2010-12-03 
22:10:47 UTC (rev 305957)
+++ php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_43139.phpt   2010-12-03 
22:58:21 UTC (rev 305958)
@@ -17,7 +17,12 @@
 $db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
 $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);

-var_dump($db->query('select 0 as abc, 1 as xyz, 2 as 
def')->fetchAll(PDO::FETCH_GROUP));
+$from = '';
+if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'oci') {
+       $from = 'from dual';
+}
+
+var_dump($db->query("select 0 as abc, 1 as xyz, 2 as def 
$from")->fetchAll(PDO::FETCH_GROUP));
 ?>
 --EXPECT--
 array(1) {

Modified: php/php-src/trunk/ext/pdo/tests/bug_43139.phpt
===================================================================
--- php/php-src/trunk/ext/pdo/tests/bug_43139.phpt      2010-12-03 22:10:47 UTC 
(rev 305957)
+++ php/php-src/trunk/ext/pdo/tests/bug_43139.phpt      2010-12-03 22:58:21 UTC 
(rev 305958)
@@ -17,7 +17,12 @@
 $db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
 $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);

-var_dump($db->query('select 0 as abc, 1 as xyz, 2 as 
def')->fetchAll(PDO::FETCH_GROUP));
+$from = '';
+if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'oci') {
+       $from = 'from dual';
+}
+
+var_dump($db->query("select 0 as abc, 1 as xyz, 2 as def 
$from")->fetchAll(PDO::FETCH_GROUP));
 ?>
 --EXPECT--
 array(1) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to