felipe Sat, 04 Dec 2010 12:40:00 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=305962
Log:
- Fixed tests
Changed paths:
U php/php-src/branches/PHP_5_2/ext/pdo/tests/bug_38253.phpt
U php/php-src/branches/PHP_5_2/ext/pdo/tests/bug_43139.phpt
U php/php-src/branches/PHP_5_2/ext/pdo/tests/pdo_018.phpt
U php/php-src/branches/PHP_5_2/ext/pdo/tests/pdo_021.phpt
Modified: php/php-src/branches/PHP_5_2/ext/pdo/tests/bug_38253.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo/tests/bug_38253.phpt 2010-12-04
12:28:23 UTC (rev 305961)
+++ php/php-src/branches/PHP_5_2/ext/pdo/tests/bug_38253.phpt 2010-12-04
12:40:00 UTC (rev 305962)
@@ -24,7 +24,13 @@
$pdo = PDOTest::factory();
-$pdo->exec ("create table test2 (id integer primary key, n text)");
+if ($pdo->getAttribute(PDO::ATTR_DRIVER_NAME) == 'oci') {
+ $type = "clob";
+} else{
+ $type = "text";
+}
+
+$pdo->exec ("create table test2 (id integer primary key, n $type)");
$pdo->exec ("INSERT INTO test2 (id, n) VALUES (1,'hi')");
$pdo->setAttribute (PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_FUNC);
Modified: php/php-src/branches/PHP_5_2/ext/pdo/tests/bug_43139.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo/tests/bug_43139.phpt 2010-12-04
12:28:23 UTC (rev 305961)
+++ php/php-src/branches/PHP_5_2/ext/pdo/tests/bug_43139.phpt 2010-12-04
12:40:00 UTC (rev 305962)
@@ -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/branches/PHP_5_2/ext/pdo/tests/pdo_018.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo/tests/pdo_018.phpt 2010-12-04
12:28:23 UTC (rev 305961)
+++ php/php-src/branches/PHP_5_2/ext/pdo/tests/pdo_018.phpt 2010-12-04
12:40:00 UTC (rev 305962)
@@ -127,8 +127,14 @@
unset($stmt);
echo "===DATA===\n";
-var_dump($db->query('SELECT test.val FROM test')->fetchAll(PDO::FETCH_COLUMN));
+$res = $db->query('SELECT test.val FROM test')->fetchAll(PDO::FETCH_COLUMN);
+// For Oracle map NULL to empty string so the test doesn't diff
+if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'oci' && $res[0] === null) {
+ $res[0] = "";
+}
+var_dump($res);
+
echo "===FAILURE===\n";
try
{
Modified: php/php-src/branches/PHP_5_2/ext/pdo/tests/pdo_021.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo/tests/pdo_021.phpt 2010-12-04
12:28:23 UTC (rev 305961)
+++ php/php-src/branches/PHP_5_2/ext/pdo/tests/pdo_021.phpt 2010-12-04
12:40:00 UTC (rev 305962)
@@ -41,8 +41,6 @@
$num = $select->fetchColumn();
echo 'There are ' . $num . " rows in the table.\n";
-$select->closeCursor();
-
// Insert using named parameters
$stmt2 = $db->prepare("INSERT INTO test VALUES(:first, :second, :third)");
foreach ($data as $row) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
