From c6aa455ff19bc61ac31fca054c60c0ae4f436fd6 Mon Sep 17 00:00:00 2001
From: Matteo Beccati <mbeccati@php.net>
Date: Tue, 12 May 2009 23:39:57 +0000
Subject: [PATCH] - Moved test for bug #44861 to PDO commons and added support
 for pdo_oci # This allows scrollable cursors to be tested with all the
 drivers # that currently support them (pgsql and oci), ensuring a consistent
 # behaviour. The test is skipped when using other drivers.

---
 .../tests/bug_44861.phpt}                     | 40 ++++++++++++++-----
 1 file changed, 29 insertions(+), 11 deletions(-)
 rename ext/{pdo_pgsql/tests/bug44861.phpt => pdo/tests/bug_44861.phpt} (57%)

diff --git a/ext/pdo_pgsql/tests/bug44861.phpt b/ext/pdo/tests/bug_44861.phpt
similarity index 57%
rename from ext/pdo_pgsql/tests/bug44861.phpt
rename to ext/pdo/tests/bug_44861.phpt
index 89166759fa..a392372904 100644
--- a/ext/pdo_pgsql/tests/bug44861.phpt
+++ b/ext/pdo/tests/bug_44861.phpt
@@ -1,23 +1,41 @@
 --TEST--
-Bug #44861 (scrollable cursor don't work with pgsql)
+PDO Common: Bug #44861 (scrollable cursor don't work with pgsql)
 --SKIPIF--
-<?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
-require dirname(__FILE__) . '/config.inc';
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) die('skip no driver');
+$allowed = array('oci', 'pgsql');
+$ok = false;
+foreach ($allowed as $driver) {
+	if (!strncasecmp(getenv('PDOTEST_DSN'), $driver, strlen($driver))) {
+		$ok = true;
+	}
+}
+if (!$ok) {
+	die("skip Scrollable cursors not supported");
+}
+require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>
 --FILE--
 <?php
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
-$dbh = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+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();
 
-$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'oci') {
+	$from = 'FROM DUAL';
+} else {
+	$from = '';
+}
 
-$query = "SELECT 'row1' AS r UNION SELECT 'row2' UNION SELECT 'row3' UNION SELECT 'row4'";
+$query = "SELECT 'row1' AS r $from UNION SELECT 'row2' $from UNION SELECT 'row3' $from UNION SELECT 'row4' $from";
 $aParams = array(PDO::ATTR_CURSOR => PDO::CURSOR_SCROLL);
 
-$res = $dbh->prepare($query, $aParams);
+$res = $db->prepare($query, $aParams);
 $res->execute();
 var_dump($res->fetchColumn());
 var_dump($res->fetchColumn());
@@ -34,7 +52,7 @@ var_dump($res->fetch(PDO::FETCH_NUM, PDO::FETCH_ORI_REL, -1));
 var_dump($res->fetchAll(PDO::FETCH_ASSOC));
 
 // Test binding params via emulated prepared query
-$res = $dbh->prepare("SELECT ?", $aParams);
+$res = $db->prepare("SELECT ? $from", $aParams);
 $res->execute(array("it's working"));
 var_dump($res->fetch(PDO::FETCH_NUM));
 
-- 
2.40.0