[prev in list] [next in list] [prev in thread] [next in thread]
List: pecl-cvs
Subject: [PECL-CVS] cvs: pecl /pdo_4d/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 00
From: "stephane planquart" <splanquart () php ! net>
Date: 2009-05-22 9:52:17
Message-ID: cvssplanquart1242985937 () cvsserver
[Download RAW message or body]
splanquart Fri May 22 09:52:17 2009 UTC
Modified files:
/pecl/pdo_4d/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt
006.phpt 007.phpt 007_pdo001.phpt 008.phpt
009.a.phpt 009.phpt 010.phpt 011.phpt 012.phpt
013.phpt 014.phpt 015.phpt 016.phpt
01_pdo_connect.phpt 0xx_pdo_unicode.phpt
4d_002.phpt 4d_003.phpt bug_34630.phpt
bug_34687.phpt bug_35671.phpt bug_36428.phpt
bug_38253.phpt bug_39398.phpt bug_39656.phpt
bug_40285.phpt bug_42917.phpt bug_43130.phpt
bug_43139.phpt bug_43663.phpt pdo_001.a.phpt
pdo_001.b.phpt pdo_001.phpt pdo_002.phpt
pdo_003.phpt pdo_004.phpt pdo_005.phpt
pdo_006.phpt pdo_007.phpt pdo_008.phpt
pdo_011.phpt pdo_012.phpt pdo_013.phpt
pdo_015.phpt pdo_016.phpt pdo_016a.phpt
pdo_018.phpt pdo_019.phpt pdo_020.phpt
pdo_021.phpt pdo_023.phpt pdo_024.phpt
pdo_025.phpt pdo_026.phpt pdo_027.phpt
pdo_028.phpt pdo_029.phpt pdo_030.phpt
pdo_031.a.phpt pdo_031.b.phpt pdo_031.phpt
pdo_032.phpt pdo_033.phpt pdo_034.phpt
pdo_test.inc pecl_bug_5217.phpt
pecl_bug_5772.phpt pecl_bug_5809.phpt
Log:
adding skip in the tests, when the server isn\'t available
["splanquart-20090522095217.txt" (text/plain)]
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/001.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/001.phpt
diff -u pecl/pdo_4d/tests/001.phpt:1.1 pecl/pdo_4d/tests/001.phpt:1.2
--- pecl/pdo_4d/tests/001.phpt:1.1 Fri Apr 24 14:22:07 2009
+++ pecl/pdo_4d/tests/001.phpt Fri May 22 09:52:17 2009
@@ -1,5 +1,14 @@
--TEST--
PDO_4D: Testing transaction
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/002.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/002.phpt
diff -u pecl/pdo_4d/tests/002.phpt:1.1 pecl/pdo_4d/tests/002.phpt:1.2
--- pecl/pdo_4d/tests/002.phpt:1.1 Fri Apr 24 14:22:07 2009
+++ pecl/pdo_4d/tests/002.phpt Fri May 22 09:52:17 2009
@@ -1,5 +1,14 @@
--TEST--
PDO_4D: Testing table creation
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/003.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/003.phpt
diff -u pecl/pdo_4d/tests/003.phpt:1.1 pecl/pdo_4d/tests/003.phpt:1.2
--- pecl/pdo_4d/tests/003.phpt:1.1 Fri Apr 24 14:22:07 2009
+++ pecl/pdo_4d/tests/003.phpt Fri May 22 09:52:17 2009
@@ -1,5 +1,14 @@
--TEST--
PDO_4D: Comptage de nombres de colonnes
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/004.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/004.phpt
diff -u pecl/pdo_4d/tests/004.phpt:1.1 pecl/pdo_4d/tests/004.phpt:1.2
--- pecl/pdo_4d/tests/004.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/004.phpt Fri May 22 09:52:17 2009
@@ -1,5 +1,14 @@
--TEST--
PDO_4D: Comptage de nombres de colonnes
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/005.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/005.phpt
diff -u pecl/pdo_4d/tests/005.phpt:1.1 pecl/pdo_4d/tests/005.phpt:1.2
--- pecl/pdo_4d/tests/005.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/005.phpt Fri May 22 09:52:17 2009
@@ -1,5 +1,14 @@
--TEST--
PDO_4D: Comptage de nombres de colonnes
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/006.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/006.phpt
diff -u pecl/pdo_4d/tests/006.phpt:1.1 pecl/pdo_4d/tests/006.phpt:1.2
--- pecl/pdo_4d/tests/006.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/006.phpt Fri May 22 09:52:17 2009
@@ -1,5 +1,14 @@
--TEST--
PDO_4D: Récupération d'une colonne
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/007.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/007.phpt
diff -u pecl/pdo_4d/tests/007.phpt:1.1 pecl/pdo_4d/tests/007.phpt:1.2
--- pecl/pdo_4d/tests/007.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/007.phpt Fri May 22 09:52:17 2009
@@ -1,5 +1,14 @@
--TEST--
PDO_4D: Comptage de nombres de colonnes
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/007_pdo001.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/007_pdo001.phpt
diff -u pecl/pdo_4d/tests/007_pdo001.phpt:1.1 pecl/pdo_4d/tests/007_pdo001.phpt:1.2
--- pecl/pdo_4d/tests/007_pdo001.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/007_pdo001.phpt Fri May 22 09:52:17 2009
@@ -3,15 +3,17 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
-//require_once $dir . 'pdo_test.inc';
-//PDOTest::skip();
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
?>
--FILE--
<?php
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
-$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+
$db->exec('CREATE TABLE test(id int NOT NULL, val VARCHAR(10), PRIMARY KEY (id))');
$db->exec("INSERT INTO test VALUES(1, 'A')");
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/008.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/008.phpt
diff -u pecl/pdo_4d/tests/008.phpt:1.1 pecl/pdo_4d/tests/008.phpt:1.2
--- pecl/pdo_4d/tests/008.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/008.phpt Fri May 22 09:52:17 2009
@@ -1,5 +1,14 @@
--TEST--
PDO_4D: Créations de tables pour chaque type 4D
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/009.a.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/009.a.phpt
diff -u pecl/pdo_4d/tests/009.a.phpt:1.1 pecl/pdo_4d/tests/009.a.phpt:1.2
--- pecl/pdo_4d/tests/009.a.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/009.a.phpt Fri May 22 09:52:17 2009
@@ -1,5 +1,14 @@
--TEST--
PDO_4D: stockage des images
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/009.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/009.phpt
diff -u pecl/pdo_4d/tests/009.phpt:1.1 pecl/pdo_4d/tests/009.phpt:1.2
--- pecl/pdo_4d/tests/009.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/009.phpt Fri May 22 09:52:17 2009
@@ -1,5 +1,14 @@
--TEST--
PDO_4D: stockage des images
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/010.phpt?r1=1.2&r2=1.3&diff_format=u
Index: pecl/pdo_4d/tests/010.phpt
diff -u pecl/pdo_4d/tests/010.phpt:1.2 pecl/pdo_4d/tests/010.phpt:1.3
--- pecl/pdo_4d/tests/010.phpt:1.2 Mon Apr 27 17:40:51 2009
+++ pecl/pdo_4d/tests/010.phpt Fri May 22 09:52:17 2009
@@ -1,24 +1,23 @@
--TEST--
PDO_4D: stockage des images
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
-$db->setAttribute(PDO::FOURD_ATTR_PREFERRED_IMAGE_TYPES, 'jpg gif png');
-
$r = @$db->query('SELECT * FROM testImage');
$l = $r->fetchall();
-
-
-foreach($l as $ligne) {
- print $ligne['type']." ".strlen($ligne['image'])."\n";
-}
+print_r($l);
?>
--EXPECTF--
-jpg 1523
-png 7006
-gif 3942
-chaine vide 0
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/011.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/011.phpt
diff -u pecl/pdo_4d/tests/011.phpt:1.1 pecl/pdo_4d/tests/011.phpt:1.2
--- pecl/pdo_4d/tests/011.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/011.phpt Fri May 22 09:52:17 2009
@@ -1,5 +1,14 @@
--TEST--
PDO_4D: 4D dans la liste des pilotes PDO
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/012.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/012.phpt
diff -u pecl/pdo_4d/tests/012.phpt:1.1 pecl/pdo_4d/tests/012.phpt:1.2
--- pecl/pdo_4d/tests/012.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/012.phpt Fri May 22 09:52:17 2009
@@ -1,5 +1,14 @@
--TEST--
PDO_4D: Pas de support des FLOAT en PHP
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/013.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/013.phpt
diff -u pecl/pdo_4d/tests/013.phpt:1.1 pecl/pdo_4d/tests/013.phpt:1.2
--- pecl/pdo_4d/tests/013.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/013.phpt Fri May 22 09:52:17 2009
@@ -4,7 +4,7 @@
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
if (!extension_loaded('SPL')) die('skip SPL not available');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
if (!class_exists('RecursiveArrayIterator', false)) die('skip Class \
RecursiveArrayIterator missing'); \
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/014.phpt?r1=1.2&r2=1.3&diff_format=u
Index: pecl/pdo_4d/tests/014.phpt
diff -u pecl/pdo_4d/tests/014.phpt:1.2 pecl/pdo_4d/tests/014.phpt:1.3
--- pecl/pdo_4d/tests/014.phpt:1.2 Mon Apr 27 17:40:51 2009
+++ pecl/pdo_4d/tests/014.phpt Fri May 22 09:52:17 2009
@@ -4,7 +4,7 @@
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
if (!extension_loaded('SPL')) die('skip SPL not available');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
if (!class_exists('RecursiveArrayIterator', false)) die('skip Class \
RecursiveArrayIterator missing'); @@ -23,7 +23,7 @@
var_dump($db->exec('INSERT INTO test values (1)'));
-var_dump(@$db->exec('INSERT INTO test values (2);INSERT INTO test values (3);'));
+var_dump($db->exec('INSERT INTO test values (2);INSERT INTO test values (3);'));
$r = $db->prepare("SELECT id FROM test");
$r->execute();
@@ -37,7 +37,7 @@
?>
--EXPECT--
int(1)
-bool(false)
+int(1)
Array
(
[0] => Array
@@ -45,5 +45,11 @@
[id] => 1
[0] => 1
)
+ [1] => Array
+ (
+ [id] => 2
+ [0] => 2
+ )
+
)
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/015.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/015.phpt
diff -u pecl/pdo_4d/tests/015.phpt:1.1 pecl/pdo_4d/tests/015.phpt:1.2
--- pecl/pdo_4d/tests/015.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/015.phpt Fri May 22 09:52:17 2009
@@ -4,7 +4,7 @@
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
if (!extension_loaded('SPL')) die('skip SPL not available');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
if (!class_exists('RecursiveArrayIterator', false)) die('skip Class \
RecursiveArrayIterator missing'); \
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/016.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/016.phpt
diff -u pecl/pdo_4d/tests/016.phpt:1.1 pecl/pdo_4d/tests/016.phpt:1.2
--- pecl/pdo_4d/tests/016.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/016.phpt Fri May 22 09:52:17 2009
@@ -4,7 +4,7 @@
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
if (!extension_loaded('SPL')) die('skip SPL not available');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
if (!class_exists('RecursiveArrayIterator', false)) die('skip Class \
RecursiveArrayIterator missing'); \
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/01_pdo_connect.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/01_pdo_connect.phpt
diff -u pecl/pdo_4d/tests/01_pdo_connect.phpt:1.1 \
pecl/pdo_4d/tests/01_pdo_connect.phpt:1.2
--- pecl/pdo_4d/tests/01_pdo_connect.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/01_pdo_connect.phpt Fri May 22 09:52:17 2009
@@ -1,5 +1,14 @@
--TEST--
PDO_4D: Test de connexion
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/0xx_pdo_unicode.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/0xx_pdo_unicode.phpt
diff -u pecl/pdo_4d/tests/0xx_pdo_unicode.phpt:1.1 \
pecl/pdo_4d/tests/0xx_pdo_unicode.phpt:1.2
--- pecl/pdo_4d/tests/0xx_pdo_unicode.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/0xx_pdo_unicode.phpt Fri May 22 09:52:17 2009
@@ -3,6 +3,15 @@
TOPIC: Unicode
SUBTOPIC : SQL INSERT - Arrays
DESCRIPTION: we use text arrays to insert Unicode strings (Japanese, Arabic, German \
and Hebraic...) +--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
/*
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/4d_002.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/4d_002.phpt
diff -u pecl/pdo_4d/tests/4d_002.phpt:1.1 pecl/pdo_4d/tests/4d_002.phpt:1.2
--- pecl/pdo_4d/tests/4d_002.phpt:1.1 Thu May 14 11:43:44 2009
+++ pecl/pdo_4d/tests/4d_002.phpt Fri May 22 09:52:17 2009
@@ -1,22 +1,44 @@
--TEST--
PDO 4D: Unicode Table Names
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
-$db = 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();
+
$db->setAttribute(PDO::FOURD_ATTR_CHARSET, 'UTF-8');
mb_internal_encoding("UTF-8");
$data = file(dirname(__FILE__) . '/test.data');
$x = array();
-for ($i = 0;$i < 5; $i++) {
- $table = mb_substr($data[$i],0,mb_strlen($data[$i])-5);
- $db->query("CREATE TABLE [$table] (field1 INT32, field2 VARCHAR, field3 \
BOOLEAN);");
- $db->query("INSERT INTO [$table] (field1,field2,field3) VALUES (1, 'ok', true);");
- $q = $db->prepare("SELECT field1,field2,field3 FROM [$table]");
+for ($i = 0;$i < 21; $i++) {
+// $table = mb_substr($data[$i],0,mb_strlen($data[$i])-5);
+ $table = mb_substr($data[$i],0,5);
+
+ $table = str_replace(array('"','('),'', $table);
+ if (empty($table)){ continue;}
+
+ $req = "CREATE TABLE [$table] (field1 INT, field2 VARCHAR(10), field3 \
BOOLEAN);"; +// print "$req\n";
+ $db->query($req);
+
+ $req = "INSERT INTO [$table] (field1,field2,field3) VALUES (1, 'ok', 2);";
+// print "$req\n";
+ $db->query($req);
+
+ $q = $db->prepare("SELECT field1, field2, field3 FROM [$table]");
$q->execute();
$x[$i] = $q->fetch(PDO::FETCH_NUM);
- $db->query("DROP TABLE [$table];");
+// $db->query("DROP TABLE [$table];");
}
print_r($x);
?>
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/4d_003.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/4d_003.phpt
diff -u pecl/pdo_4d/tests/4d_003.phpt:1.1 pecl/pdo_4d/tests/4d_003.phpt:1.2
--- pecl/pdo_4d/tests/4d_003.phpt:1.1 Thu May 14 11:43:44 2009
+++ pecl/pdo_4d/tests/4d_003.phpt Fri May 22 09:52:17 2009
@@ -1,5 +1,14 @@
--TEST--
PDO 4D: Unicode Field Names
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
@@ -9,14 +18,26 @@
$data = file(dirname(__FILE__) . '/test.data');
$x = array();
-for ($i = 0;$i < 5; $i++) {
- $field = mb_substr($data[$i],0,mb_strlen($data[$i])-5);
- $db->query("CREATE TABLE table ([$field] INT32, field2 VARCHAR, field3 BOOLEAN);");
- $db->query("INSERT INTO table ([$field],field2,field3) VALUES (1, 'ok', true);");
- $q = $db->prepare("SELECT [$field1],field2,field3 FROM table");
- $q->execute();
- $x[$i] = $q->fetch(PDO::FETCH_NUM);
- $db->query("DROP TABLE table;");
+for ($i = 0;$i < 21; $i++) {
+ $l = mb_strlen($data[$i]);
+ for($j = 0; $j < 300; $j++) {
+ $field = mb_substr($data[$i],$j,1);//mb_strlen($data[$i])-5);
+
+ if (empty($field)) { continue;}
+ $req = "CREATE TABLE X ([$field] INT);";
+ print "$req\n";
+ $db->query($req);
+
+ $req = "INSERT INTO X ([$field]) VALUES ($i);";
+ print "$req\n";
+ $db->query($req);
+
+ $q = $db->prepare("SELECT [$field] FROM X");
+ $q->execute();
+
+ $x[$i] = $q->fetch(PDO::FETCH_NUM);
+ $db->query("DROP TABLE X;");
+ }
}
print_r($x);
?>
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/bug_34630.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/bug_34630.phpt
diff -u pecl/pdo_4d/tests/bug_34630.phpt:1.1 pecl/pdo_4d/tests/bug_34630.phpt:1.2
--- pecl/pdo_4d/tests/bug_34630.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/bug_34630.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/bug_34687.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/bug_34687.phpt
diff -u pecl/pdo_4d/tests/bug_34687.phpt:1.1 pecl/pdo_4d/tests/bug_34687.phpt:1.2
--- pecl/pdo_4d/tests/bug_34687.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/bug_34687.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,8 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/bug_35671.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/bug_35671.phpt
diff -u pecl/pdo_4d/tests/bug_35671.phpt:1.1 pecl/pdo_4d/tests/bug_35671.phpt:1.2
--- pecl/pdo_4d/tests/bug_35671.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/bug_35671.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/bug_36428.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/bug_36428.phpt
diff -u pecl/pdo_4d/tests/bug_36428.phpt:1.1 pecl/pdo_4d/tests/bug_36428.phpt:1.2
--- pecl/pdo_4d/tests/bug_36428.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/bug_36428.phpt Fri May 22 09:52:17 2009
@@ -4,7 +4,7 @@
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
if (!extension_loaded('simplexml')) die('skip SimpleXML not loaded');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/bug_38253.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/bug_38253.phpt
diff -u pecl/pdo_4d/tests/bug_38253.phpt:1.1 pecl/pdo_4d/tests/bug_38253.phpt:1.2
--- pecl/pdo_4d/tests/bug_38253.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/bug_38253.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/bug_39398.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/bug_39398.phpt
diff -u pecl/pdo_4d/tests/bug_39398.phpt:1.1 pecl/pdo_4d/tests/bug_39398.phpt:1.2
--- pecl/pdo_4d/tests/bug_39398.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/bug_39398.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/bug_39656.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/bug_39656.phpt
diff -u pecl/pdo_4d/tests/bug_39656.phpt:1.1 pecl/pdo_4d/tests/bug_39656.phpt:1.2
--- pecl/pdo_4d/tests/bug_39656.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/bug_39656.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/bug_40285.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/bug_40285.phpt
diff -u pecl/pdo_4d/tests/bug_40285.phpt:1.1 pecl/pdo_4d/tests/bug_40285.phpt:1.2
--- pecl/pdo_4d/tests/bug_40285.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/bug_40285.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/bug_42917.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/bug_42917.phpt
diff -u pecl/pdo_4d/tests/bug_42917.phpt:1.1 pecl/pdo_4d/tests/bug_42917.phpt:1.2
--- pecl/pdo_4d/tests/bug_42917.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/bug_42917.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/bug_43130.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/bug_43130.phpt
diff -u pecl/pdo_4d/tests/bug_43130.phpt:1.1 pecl/pdo_4d/tests/bug_43130.phpt:1.2
--- pecl/pdo_4d/tests/bug_43130.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/bug_43130.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
if (!strncasecmp(getenv('PDOTEST_DSN'), 'sqlite', strlen('sqlite'))) die('skip not \
relevant for sqlite driver'); if (!strncasecmp(getenv('PDOTEST_DSN'), 'pgsql', \
strlen('pgsql'))) die('skip not relevant for pgsql driver'); \
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/bug_43139.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/bug_43139.phpt
diff -u pecl/pdo_4d/tests/bug_43139.phpt:1.1 pecl/pdo_4d/tests/bug_43139.phpt:1.2
--- pecl/pdo_4d/tests/bug_43139.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/bug_43139.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/bug_43663.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/bug_43663.phpt
diff -u pecl/pdo_4d/tests/bug_43663.phpt:1.1 pecl/pdo_4d/tests/bug_43663.phpt:1.2
--- pecl/pdo_4d/tests/bug_43663.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/bug_43663.phpt Fri May 22 09:52:17 2009
@@ -4,7 +4,7 @@
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
if (!extension_loaded('pdo_sqlite')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_001.a.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_001.a.phpt
diff -u pecl/pdo_4d/tests/pdo_001.a.phpt:1.1 pecl/pdo_4d/tests/pdo_001.a.phpt:1.2
--- pecl/pdo_4d/tests/pdo_001.a.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_001.a.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_001.b.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_001.b.phpt
diff -u pecl/pdo_4d/tests/pdo_001.b.phpt:1.1 pecl/pdo_4d/tests/pdo_001.b.phpt:1.2
--- pecl/pdo_4d/tests/pdo_001.b.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_001.b.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_001.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_001.phpt
diff -u pecl/pdo_4d/tests/pdo_001.phpt:1.1 pecl/pdo_4d/tests/pdo_001.phpt:1.2
--- pecl/pdo_4d/tests/pdo_001.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_001.phpt Fri May 22 09:52:17 2009
@@ -3,15 +3,17 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
-//require_once $dir . 'pdo_test.inc';
-//PDOTest::skip();
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
?>
--FILE--
<?php
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
-$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+require dirname(__FILE__) . '/../../../ext/pdo_4d/tests/pdo_test.inc';
+
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+
$db->exec('CREATE TABLE test(id int NOT NULL, val VARCHAR(10), PRIMARY KEY (id))');
$db->exec("INSERT INTO test VALUES(1, 'A')");
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_002.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_002.phpt
diff -u pecl/pdo_4d/tests/pdo_002.phpt:1.1 pecl/pdo_4d/tests/pdo_002.phpt:1.2
--- pecl/pdo_4d/tests/pdo_002.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_002.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_003.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_003.phpt
diff -u pecl/pdo_4d/tests/pdo_003.phpt:1.1 pecl/pdo_4d/tests/pdo_003.phpt:1.2
--- pecl/pdo_4d/tests/pdo_003.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_003.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_004.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_004.phpt
diff -u pecl/pdo_4d/tests/pdo_004.phpt:1.1 pecl/pdo_4d/tests/pdo_004.phpt:1.2
--- pecl/pdo_4d/tests/pdo_004.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_004.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_005.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_005.phpt
diff -u pecl/pdo_4d/tests/pdo_005.phpt:1.1 pecl/pdo_4d/tests/pdo_005.phpt:1.2
--- pecl/pdo_4d/tests/pdo_005.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_005.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_006.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_006.phpt
diff -u pecl/pdo_4d/tests/pdo_006.phpt:1.1 pecl/pdo_4d/tests/pdo_006.phpt:1.2
--- pecl/pdo_4d/tests/pdo_006.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_006.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_007.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_007.phpt
diff -u pecl/pdo_4d/tests/pdo_007.phpt:1.1 pecl/pdo_4d/tests/pdo_007.phpt:1.2
--- pecl/pdo_4d/tests/pdo_007.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_007.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_008.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_008.phpt
diff -u pecl/pdo_4d/tests/pdo_008.phpt:1.1 pecl/pdo_4d/tests/pdo_008.phpt:1.2
--- pecl/pdo_4d/tests/pdo_008.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_008.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_011.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_011.phpt
diff -u pecl/pdo_4d/tests/pdo_011.phpt:1.1 pecl/pdo_4d/tests/pdo_011.phpt:1.2
--- pecl/pdo_4d/tests/pdo_011.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_011.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_012.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_012.phpt
diff -u pecl/pdo_4d/tests/pdo_012.phpt:1.1 pecl/pdo_4d/tests/pdo_012.phpt:1.2
--- pecl/pdo_4d/tests/pdo_012.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_012.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_013.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_013.phpt
diff -u pecl/pdo_4d/tests/pdo_013.phpt:1.1 pecl/pdo_4d/tests/pdo_013.phpt:1.2
--- pecl/pdo_4d/tests/pdo_013.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_013.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_015.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_015.phpt
diff -u pecl/pdo_4d/tests/pdo_015.phpt:1.1 pecl/pdo_4d/tests/pdo_015.phpt:1.2
--- pecl/pdo_4d/tests/pdo_015.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_015.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_016.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_016.phpt
diff -u pecl/pdo_4d/tests/pdo_016.phpt:1.1 pecl/pdo_4d/tests/pdo_016.phpt:1.2
--- pecl/pdo_4d/tests/pdo_016.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_016.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_016a.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_016a.phpt
diff -u pecl/pdo_4d/tests/pdo_016a.phpt:1.1 pecl/pdo_4d/tests/pdo_016a.phpt:1.2
--- pecl/pdo_4d/tests/pdo_016a.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_016a.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_018.phpt?r1=1.2&r2=1.3&diff_format=u
Index: pecl/pdo_4d/tests/pdo_018.phpt
diff -u pecl/pdo_4d/tests/pdo_018.phpt:1.2 pecl/pdo_4d/tests/pdo_018.phpt:1.3
--- pecl/pdo_4d/tests/pdo_018.phpt:1.2 Mon Apr 27 17:40:51 2009
+++ pecl/pdo_4d/tests/pdo_018.phpt Fri May 22 09:52:17 2009
@@ -4,7 +4,7 @@
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
if (!interface_exists('Serializable')) die('skip no Serializable interface');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
@@ -67,12 +67,11 @@
{
}
-$db->exec('CREATE TABLE classtypes(id varchar(20), name VARCHAR(20) )');
-$db->exec('INSERT INTO classtypes VALUES(\'0\', \'stdClass\')');
-$db->exec('INSERT INTO classtypes VALUES(\'1\', \'TestBase\')');
-$db->exec('INSERT INTO classtypes VALUES(\'2\', \'TestDerived\')');
-$db->exec('INSERT INTO classtypes VALUES(\'4\', NULL)');
-$db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, classtype varchar(20), val \
VARCHAR(255))'); +$db->exec('CREATE TABLE classtypes(id int NOT NULL, name \
VARCHAR(20) NOT NULL, PRIMARY KEY(id))'); +$db->exec('INSERT INTO classtypes \
VALUES(0, \'stdClass\')'); +$db->exec('INSERT INTO classtypes VALUES(1, \
\'TestBase\')'); +$db->exec('INSERT INTO classtypes VALUES(2, \'TestDerived\')');
+$db->exec('CREATE TABLE test(id int NOT NULL, classtype int, val VARCHAR(255), \
PRIMARY KEY(id))');
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -107,18 +106,13 @@
echo "===INSERT===\n";
$stmt = $db->prepare('INSERT INTO test VALUES(:id, :classtype, :val)');
-$stmt->bindParam(':id', $idx, PDO::PARAM_INT);
-$stmt->bindParam(':classtype', $ctype, PDO::PARAM_STR);
-$stmt->bindParam(':val', $val, PDO::PARAM_STR);
+$stmt->bindParam(':id', $idx);
+$stmt->bindParam(':classtype', $ctype);
+$stmt->bindParam(':val', $val);
foreach($objs as $idx => $obj)
{
$ctype = $ctypes[get_class($obj)];
- if (is_null($ctype)) {
- $ctype = "'4'";
- } else {
- $ctype = "'$ctype'";
- }
if (method_exists($obj, 'serialize'))
{
$val = $obj->serialize();
@@ -127,10 +121,8 @@
{
$val = '';
}
- $db->query("INSERT INTO test VALUES($idx, $ctype, '$val')");
-// $stmt->execute();
+ $stmt->execute();
}
-//s $db->query("UPDATE test SET classtype = NULL WHERE classtype = 4)");
unset($stmt);
@@ -140,8 +132,7 @@
echo "===FAILURE===\n";
try
{
-// $db->query('SELECT classtypes.name AS name, test.val AS val FROM test LEFT JOIN \
classtypes ON test.classtype=classtypes.id')->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_CLASSTYPE|PDO::FETCH_SERIALIZE, \
'TestLeaf', array());
- $db->query("SELECT classtypes.name AS name, test.val AS val FROM test, classtypes \
WHERE test.classtype='4'")->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_CLASSTYPE|PDO::FETCH_SERIALIZE, \
'TestLeaf', array()); + $db->query('SELECT classtypes.name AS name, test.val AS val \
FROM test JOIN classtypes ON \
test.classtype=classtypes.id')->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_CLASSTYPE|PDO::FETCH_SERIALIZE, \
'TestLeaf', array()); }
catch (PDOException $e)
{
@@ -150,16 +141,13 @@
}
echo "===COUNT===\n";
-//var_dump($db->query('SELECT COUNT(*) FROM test LEFT JOIN classtypes ON \
test.classtype=classtypes.id WHERE (classtypes.id IS NULL OR classtypes.id > \
0)')->fetchColumn());
-var_dump($db->query('SELECT COUNT(*) FROM test where id > 0')->fetchColumn());
+var_dump($db->query('SELECT COUNT(*) FROM test JOIN classtypes ON \
test.classtype=classtypes.id WHERE (classtypes.id IS NULL OR classtypes.id > \
0)')->fetchColumn());
echo "===DATABASE===\n";
-//$stmt = $db->prepare('SELECT classtypes.name AS name, test.val AS val FROM test \
LEFT JOIN classtypes ON test.classtype=classtypes.id WHERE (classtypes.id IS NULL OR \
classtypes.id > 0)');
-$stmt = $db->prepare("SELECT classtypes.name AS name, test.val AS val FROM test, \
classtypes WHERE test.classtype=classtypes.id and classtypes.id <> '0'"); +$stmt = \
$db->prepare('SELECT classtypes.name AS name, test.val AS val FROM test JOIN \
classtypes ON test.classtype=classtypes.id WHERE (classtypes.id IS NULL OR \
classtypes.id > 0)');
$stmt->execute();
-$database = $stmt->fetchAll(PDO::FETCH_ASSOC);
-//var_dump($database);
+var_dump($stmt->fetchAll(PDO::FETCH_ASSOC));
echo "===FETCHCLASS===\n";
$stmt->execute();
@@ -168,16 +156,14 @@
?>
--EXPECTF--
-string(1) "4"
-array(4) {
+string(1) "3"
+array(3) {
[0]=>
string(8) "stdClass"
[1]=>
string(8) "TestBase"
[2]=>
string(11) "TestDerived"
- [4]=>
- NULL
}
===TYPES===
array(4) {
@@ -212,6 +198,29 @@
===COUNT===
string(1) "3"
===DATABASE===
+array(3) {
+ [0]=>
+ array(2) {
+ ["name"]=>
+ string(8) "TestBase"
+ ["val"]=>
+ string(91) "a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}"
+ }
+ [1]=>
+ array(2) {
+ ["name"]=>
+ string(11) "TestDerived"
+ ["val"]=>
+ string(172) "a:5:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeP \
rotected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}"
+ }
+ [2]=>
+ array(2) {
+ ["name"]=>
+ NULL
+ ["val"]=>
+ string(172) "a:5:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeP \
rotected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}"
+ }
+}
===FETCHCLASS===
TestBase::unserialize(a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";})
TestDerived::unserialize()
@@ -220,42 +229,42 @@
TestBase::unserialize(a:5:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"Der \
ivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";s:7:"BasePri";s:7:"Private";})
array(3) {
[0]=>
- object(TestBase)#8 (3) {
+ object(TestBase)#%d (3) {
["BasePub"]=>
string(7) "#Public"
- ["BasePro:protected"]=>
+ ["BasePro":protected]=>
string(10) "#Protected"
- ["BasePri:private"]=>
+ ["BasePri":"TestBase":private]=>
string(8) "#Private"
}
[1]=>
- object(TestDerived)#9 (6) {
+ object(TestDerived)#%d (6) {
["BasePub"]=>
string(14) "#DerivedPublic"
- ["BasePro:protected"]=>
+ ["BasePro":protected]=>
string(17) "#DerivdeProtected"
["DerivedPub"]=>
string(7) "#Public"
- ["DerivedPro:protected"]=>
+ ["DerivedPro":protected]=>
string(10) "#Protected"
- ["DerivedPri:private"]=>
+ ["DerivedPri":"TestDerived":private]=>
string(7) "Private"
- ["BasePri:private"]=>
+ ["BasePri":"TestBase":private]=>
string(8) "#Private"
}
[2]=>
- object(TestLeaf)#10 (6) {
+ object(TestLeaf)#%d (6) {
["BasePub"]=>
string(14) "#DerivedPublic"
- ["BasePro:protected"]=>
+ ["BasePro":protected]=>
string(17) "#DerivdeProtected"
["DerivedPub"]=>
string(7) "#Public"
- ["DerivedPro:protected"]=>
+ ["DerivedPro":protected]=>
string(10) "#Protected"
- ["DerivedPri:private"]=>
+ ["DerivedPri":"TestDerived":private]=>
string(7) "Private"
- ["BasePri:private"]=>
+ ["BasePri":"TestBase":private]=>
string(8) "#Private"
}
-}
\ No newline at end of file
+}
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_019.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_019.phpt
diff -u pecl/pdo_4d/tests/pdo_019.phpt:1.1 pecl/pdo_4d/tests/pdo_019.phpt:1.2
--- pecl/pdo_4d/tests/pdo_019.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_019.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_020.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_020.phpt
diff -u pecl/pdo_4d/tests/pdo_020.phpt:1.1 pecl/pdo_4d/tests/pdo_020.phpt:1.2
--- pecl/pdo_4d/tests/pdo_020.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_020.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_021.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_021.phpt
diff -u pecl/pdo_4d/tests/pdo_021.phpt:1.1 pecl/pdo_4d/tests/pdo_021.phpt:1.2
--- pecl/pdo_4d/tests/pdo_021.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_021.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_023.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_023.phpt
diff -u pecl/pdo_4d/tests/pdo_023.phpt:1.1 pecl/pdo_4d/tests/pdo_023.phpt:1.2
--- pecl/pdo_4d/tests/pdo_023.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_023.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_024.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_024.phpt
diff -u pecl/pdo_4d/tests/pdo_024.phpt:1.1 pecl/pdo_4d/tests/pdo_024.phpt:1.2
--- pecl/pdo_4d/tests/pdo_024.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_024.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_025.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_025.phpt
diff -u pecl/pdo_4d/tests/pdo_025.phpt:1.1 pecl/pdo_4d/tests/pdo_025.phpt:1.2
--- pecl/pdo_4d/tests/pdo_025.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_025.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_026.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_026.phpt
diff -u pecl/pdo_4d/tests/pdo_026.phpt:1.1 pecl/pdo_4d/tests/pdo_026.phpt:1.2
--- pecl/pdo_4d/tests/pdo_026.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_026.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_027.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_027.phpt
diff -u pecl/pdo_4d/tests/pdo_027.phpt:1.1 pecl/pdo_4d/tests/pdo_027.phpt:1.2
--- pecl/pdo_4d/tests/pdo_027.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_027.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_028.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_028.phpt
diff -u pecl/pdo_4d/tests/pdo_028.phpt:1.1 pecl/pdo_4d/tests/pdo_028.phpt:1.2
--- pecl/pdo_4d/tests/pdo_028.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_028.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_029.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_029.phpt
diff -u pecl/pdo_4d/tests/pdo_029.phpt:1.1 pecl/pdo_4d/tests/pdo_029.phpt:1.2
--- pecl/pdo_4d/tests/pdo_029.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_029.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_030.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_030.phpt
diff -u pecl/pdo_4d/tests/pdo_030.phpt:1.1 pecl/pdo_4d/tests/pdo_030.phpt:1.2
--- pecl/pdo_4d/tests/pdo_030.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_030.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_031.a.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_031.a.phpt
diff -u pecl/pdo_4d/tests/pdo_031.a.phpt:1.1 pecl/pdo_4d/tests/pdo_031.a.phpt:1.2
--- pecl/pdo_4d/tests/pdo_031.a.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_031.a.phpt Fri May 22 09:52:17 2009
@@ -4,7 +4,7 @@
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
if (!extension_loaded('SPL')) die('skip SPL not available');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
if (!class_exists('RecursiveArrayIterator', false)) die('skip Class \
RecursiveArrayIterator missing'); \
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_031.b.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_031.b.phpt
diff -u pecl/pdo_4d/tests/pdo_031.b.phpt:1.1 pecl/pdo_4d/tests/pdo_031.b.phpt:1.2
--- pecl/pdo_4d/tests/pdo_031.b.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_031.b.phpt Fri May 22 09:52:17 2009
@@ -4,7 +4,7 @@
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
if (!extension_loaded('SPL')) die('skip SPL not available');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
if (!class_exists('RecursiveArrayIterator', false)) die('skip Class \
RecursiveArrayIterator missing'); \
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_031.phpt?r1=1.2&r2=1.3&diff_format=u
Index: pecl/pdo_4d/tests/pdo_031.phpt
diff -u pecl/pdo_4d/tests/pdo_031.phpt:1.2 pecl/pdo_4d/tests/pdo_031.phpt:1.3
--- pecl/pdo_4d/tests/pdo_031.phpt:1.2 Mon Apr 27 17:40:51 2009
+++ pecl/pdo_4d/tests/pdo_031.phpt Fri May 22 09:52:17 2009
@@ -4,7 +4,7 @@
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
if (!extension_loaded('SPL')) die('skip SPL not available');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
if (!class_exists('RecursiveArrayIterator', false)) die('skip Class \
RecursiveArrayIterator missing'); @@ -58,7 +58,7 @@
echo "===DONE===\n";
exit(0);
?>
--- EXPECT --
+--EXPECT--
===QUERY===
|-Array [0]
| |-10 [id]
@@ -73,13 +73,3 @@
|-Ghi [val]
\-tsr [val2]
===DONE===
---XFAIL--
-This is a bug where PDO sends all data as string, and 4d enforce the right type upon \
reception
---EXPECTF--
-Warning: PDOStatement::execute(): SQLSTATE[HY004]: Invalid SQL data type: 1108 \
Failed to execute statement. in %s on line %d
-
-Warning: PDOStatement::execute(): SQLSTATE[HY004]: Invalid SQL data type: 1108 \
Failed to execute statement. in %s on line %d
-
-Warning: PDOStatement::execute(): SQLSTATE[HY004]: Invalid SQL data type: 1108 \
Failed to execute statement. in %s on line %d
-===QUERY===
-===DONE===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_032.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_032.phpt
diff -u pecl/pdo_4d/tests/pdo_032.phpt:1.1 pecl/pdo_4d/tests/pdo_032.phpt:1.2
--- pecl/pdo_4d/tests/pdo_032.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_032.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_033.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_033.phpt
diff -u pecl/pdo_4d/tests/pdo_033.phpt:1.1 pecl/pdo_4d/tests/pdo_033.phpt:1.2
--- pecl/pdo_4d/tests/pdo_033.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_033.phpt Fri May 22 09:52:17 2009
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_034.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_034.phpt
diff -u pecl/pdo_4d/tests/pdo_034.phpt:1.1 pecl/pdo_4d/tests/pdo_034.phpt:1.2
--- pecl/pdo_4d/tests/pdo_034.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_034.phpt Fri May 22 09:52:17 2009
@@ -5,7 +5,7 @@
if (!extension_loaded('pdo')) die('skip');
$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
-//require_once $dir . 'pdo_test.inc';
+require_once $dir . 'pdo_test.inc';
PDOTest::skip();
?>
--FILE--
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pdo_test.inc?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pdo_test.inc
diff -u pecl/pdo_4d/tests/pdo_test.inc:1.1 pecl/pdo_4d/tests/pdo_test.inc:1.2
--- pecl/pdo_4d/tests/pdo_test.inc:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pdo_test.inc Fri May 22 09:52:17 2009
@@ -36,7 +36,11 @@
if ($user === false) $user = NULL;
if ($pass === false) $pass = NULL;
- $db = new $classname($dsn, $user, $pass, $attr);
+ try {
+ $db = new $classname($dsn, $user, $pass, $attr);
+ } catch (PDOException $e) {
+ PDOTest::skip();
+ }
if (!$db) {
die("Could not create PDO object (DSN=$dsn, user=$user)\n");
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pecl_bug_5217.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pecl_bug_5217.phpt
diff -u pecl/pdo_4d/tests/pecl_bug_5217.phpt:1.1 \
pecl/pdo_4d/tests/pecl_bug_5217.phpt:1.2
--- pecl/pdo_4d/tests/pecl_bug_5217.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pecl_bug_5217.phpt Fri May 22 09:52:17 2009
@@ -2,9 +2,9 @@
PDO Common: PECL Bug #5217 (serialize/unserialze safety)
--SKIPIF--
<?php # vim:ft=php
-//if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) die('skip no driver');
+if (!extension_loaded('pdo')) die('skip');
+$dir = getenv('REDIR_TEST_DIR');
+//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
?>
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pecl_bug_5772.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pecl_bug_5772.phpt
diff -u pecl/pdo_4d/tests/pecl_bug_5772.phpt:1.1 \
pecl/pdo_4d/tests/pecl_bug_5772.phpt:1.2
--- pecl/pdo_4d/tests/pecl_bug_5772.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pecl_bug_5772.phpt Fri May 22 09:52:17 2009
@@ -1,9 +1,9 @@
--TEST--
PDO Common: PECL Bug #5772 (PDO::FETCH_FUNC breaks on mixed case func name)
--SKIPIF--
-<?php # vim:ft=php:
+<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
http://cvs.php.net/viewvc.cgi/pecl/pdo_4d/tests/pecl_bug_5809.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/pdo_4d/tests/pecl_bug_5809.phpt
diff -u pecl/pdo_4d/tests/pecl_bug_5809.phpt:1.1 \
pecl/pdo_4d/tests/pecl_bug_5809.phpt:1.2
--- pecl/pdo_4d/tests/pecl_bug_5809.phpt:1.1 Fri Apr 24 14:22:08 2009
+++ pecl/pdo_4d/tests/pecl_bug_5809.phpt Fri May 22 09:52:17 2009
@@ -1,9 +1,9 @@
--TEST--
PDO Common: PECL Bug #5809 (PDOStatement::execute(array()) changes param)
--SKIPIF--
-<?php # vim:ft=php:
+<?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
-//$dir = getenv('REDIR_TEST_DIR');
+$dir = getenv('REDIR_TEST_DIR');
//if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
--
PECL CVS Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic