rename pdo_test.php to pdo_test.inc, add it, and update tests.

diff --git a/ext/pdo/tests/pdo_001.phpt b/ext/pdo/tests/pdo_001.phpt
index 559ca6ccea0bdaab26c8fc16c923eb5b068bdd0a..e2f049218e756f7916f70ed5909f188843b679bf 100644 (file)
--- a/ext/pdo/tests/pdo_001.phpt
+++ b/ext/pdo/tests/pdo_001.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('pdo')) print 'skip';
 if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');

diff --git a/ext/pdo/tests/pdo_002.phpt b/ext/pdo/tests/pdo_002.phpt
index 115c80dfccf85a990ac172ac3a9d7f2139b452b7..88f2473d900f0ff7afccb6dd623f12d1ea20b5e1 100644 (file)
--- a/ext/pdo/tests/pdo_002.phpt
+++ b/ext/pdo/tests/pdo_002.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('pdo')) print 'skip';
 if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');

diff --git a/ext/pdo/tests/pdo_003.phpt b/ext/pdo/tests/pdo_003.phpt
index b800bae5a5cc97dc8c338b439ce126e4b26eacce..56e3f2f0a00cde978848189e922208e8551d370e 100644 (file)
--- a/ext/pdo/tests/pdo_003.phpt
+++ b/ext/pdo/tests/pdo_003.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('pdo')) print 'skip';
 if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');

diff --git a/ext/pdo/tests/pdo_004.phpt b/ext/pdo/tests/pdo_004.phpt
index 897deb44586a2fb1698482556e3469c972ab40f4..ee7c065967bad90fe189b90b3aa9bf71ed81d2c9 100644 (file)
--- a/ext/pdo/tests/pdo_004.phpt
+++ b/ext/pdo/tests/pdo_004.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('pdo')) print 'skip';
 if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');

diff --git a/ext/pdo/tests/pdo_005.phpt b/ext/pdo/tests/pdo_005.phpt
index c82f26709365e74de40ee63dd15c3a397ca92372..71a2c3256783dbe50340cd302f4f61ee6b762707 100644 (file)
--- a/ext/pdo/tests/pdo_005.phpt
+++ b/ext/pdo/tests/pdo_005.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('pdo')) print 'skip';
 if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(10))');

diff --git a/ext/pdo/tests/pdo_006.phpt b/ext/pdo/tests/pdo_006.phpt
index 2de877afba5f63afad8baa93e98b8ffc694f1c99..06b16d0fb421be7d64201ca3fa1cb6981b10badc 100644 (file)
--- a/ext/pdo/tests/pdo_006.phpt
+++ b/ext/pdo/tests/pdo_006.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('pdo')) print 'skip';
 if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');

diff --git a/ext/pdo/tests/pdo_007.phpt b/ext/pdo/tests/pdo_007.phpt
index ec33d652fc8b5f3887a4cd9f62690732dd9b6f6c..a8c873447f24cc4387e003b3e3f66b63b1eed8f0 100644 (file)
--- a/ext/pdo/tests/pdo_007.phpt
+++ b/ext/pdo/tests/pdo_007.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('pdo')) print 'skip';
 if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id CHAR(1) NOT NULL PRIMARY KEY, val VARCHAR(10))');

diff --git a/ext/pdo/tests/pdo_008.phpt b/ext/pdo/tests/pdo_008.phpt
index 06d07cf661c111b4c10773daffab90715486363e..2528f790aa5b8dfc933c754b9b34960607e548f0 100644 (file)
--- a/ext/pdo/tests/pdo_008.phpt
+++ b/ext/pdo/tests/pdo_008.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('pdo')) print 'skip';
 if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id CHAR(1) NOT NULL PRIMARY KEY, val VARCHAR(10))');

diff --git a/ext/pdo/tests/pdo_009.phpt b/ext/pdo/tests/pdo_009.phpt
index cce08de621b56ce2959357cbee2056cdb3d76aa7..5194ff4e9662bf7c3976dee347fb796f601547fc 100644 (file)
--- a/ext/pdo/tests/pdo_009.phpt
+++ b/ext/pdo/tests/pdo_009.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('pdo')) print 'skip';
 if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE classtypes(id int NOT NULL PRIMARY KEY, name VARCHAR(10) UNIQUE)');

diff --git a/ext/pdo/tests/pdo_010.phpt b/ext/pdo/tests/pdo_010.phpt
index b9ea3ce634b7b2b6f108f47de6801b4469bc5ebd..8898f067027cd522015cb06d0fb7d63bd2981593 100644 (file)
--- a/ext/pdo/tests/pdo_010.phpt
+++ b/ext/pdo/tests/pdo_010.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('pdo')) print 'skip';
 if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE classtypes(id int NOT NULL PRIMARY KEY, name VARCHAR(10) UNIQUE)');

diff --git a/ext/pdo/tests/pdo_011.phpt b/ext/pdo/tests/pdo_011.phpt
index 211468fc4485bc505ab2cf8457d1e303227bdc95..145772c6b5588fb432dc96753ba495902f71c176 100644 (file)
--- a/ext/pdo/tests/pdo_011.phpt
+++ b/ext/pdo/tests/pdo_011.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('pdo')) print 'skip';
 if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');

diff --git a/ext/pdo/tests/pdo_012.phpt b/ext/pdo/tests/pdo_012.phpt
index 6cc6320759bb8b7cfc171c9182810f686e5e0192..b052c9cf05d9529e5f9493f0538ad8e475bf86c8 100644 (file)
--- a/ext/pdo/tests/pdo_012.phpt
+++ b/ext/pdo/tests/pdo_012.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('pdo')) print 'skip';
 if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');

diff --git a/ext/pdo/tests/pdo_013.phpt b/ext/pdo/tests/pdo_013.phpt
index d3c33f3624cb2d0719cb4819ff216c274ea74c2a..eb420e69bcad2587e48686840ec1e26682b5b7a3 100644 (file)
--- a/ext/pdo/tests/pdo_013.phpt
+++ b/ext/pdo/tests/pdo_013.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('pdo')) print 'skip';
 if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');

diff --git a/ext/pdo/tests/pdo_014.phpt b/ext/pdo/tests/pdo_014.phpt
index 0a3f385369653bb446afe586fddf4c53c7eb34c9..8c4e66fa6a8234c7fb5158b3b7cb5eb1cc0658fa 100644 (file)
--- a/ext/pdo/tests/pdo_014.phpt
+++ b/ext/pdo/tests/pdo_014.phpt
@@ -9,7 +9,7 @@ if (!class_exists('IteratorIterator')) print 'skip IteratorIterator class not pr
 ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');

diff --git a/ext/pdo/tests/pdo_015.phpt b/ext/pdo/tests/pdo_015.phpt
index 49f33062803174eb987c45474c2de1401d0bf162..4491f2baeca6a335294285ee2a9fb5ba9d0ae1b4 100644 (file)
--- a/ext/pdo/tests/pdo_015.phpt
+++ b/ext/pdo/tests/pdo_015.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('pdo')) print 'skip';
 if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(20))');

diff --git a/ext/pdo/tests/pdo_016.phpt b/ext/pdo/tests/pdo_016.phpt
index fb67d16677443fc3776035d617866da0527309af..54923217afbb6262e19a2add1e176175cfcbf5b3 100644 (file)
--- a/ext/pdo/tests/pdo_016.phpt
+++ b/ext/pdo/tests/pdo_016.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('pdo')) print 'skip';
 if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(idx int NOT NULL PRIMARY KEY, txt VARCHAR(20))');

diff --git a/ext/pdo/tests/pdo_017.phpt b/ext/pdo/tests/pdo_017.phpt
index 5fb205c98f010bbf2143b71607a9999592faeee7..f0165fd3422ddf933574684ed95f746d60ddda6b 100644 (file)
--- a/ext/pdo/tests/pdo_017.phpt
+++ b/ext/pdo/tests/pdo_017.phpt
@@ -16,7 +16,7 @@ try {
 ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10))');

diff --git a/ext/pdo/tests/pdo_018.phpt b/ext/pdo/tests/pdo_018.phpt
index 68209e1c83d989c7c51574e452bda1808fa8fc8a..a0bfdf0f990abe36f05a7487dd1da94f75509810 100644 (file)
--- a/ext/pdo/tests/pdo_018.phpt
+++ b/ext/pdo/tests/pdo_018.phpt
@@ -8,7 +8,7 @@ if (!interface_exists('Serializable')) print 'skip no Serializable interface';
 ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 class TestBase implements Serializable

diff --git a/ext/pdo/tests/pdo_019.phpt b/ext/pdo/tests/pdo_019.phpt
index c7af4f1d2881bead5b0349d8b6928970a104d38a..1b331f982de970b7de8cbed7fc39f80f9129aa38 100644 (file)
--- a/ext/pdo/tests/pdo_019.phpt
+++ b/ext/pdo/tests/pdo_019.phpt
@@ -7,7 +7,7 @@ if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
 ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(idx int NOT NULL PRIMARY KEY, txt VARCHAR(20))');

diff --git a/ext/pdo/tests/pdo_020.phpt b/ext/pdo/tests/pdo_020.phpt
index c1aaff0c44693c4a3faa218dcfde6a4cff04f15b..8bce047bb232506564a1c328200b68c853351886 100644 (file)
--- a/ext/pdo/tests/pdo_020.phpt
+++ b/ext/pdo/tests/pdo_020.phpt
@@ -7,7 +7,7 @@ if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
 ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(16))');

diff --git a/ext/pdo/tests/pdo_021.phpt b/ext/pdo/tests/pdo_021.phpt
index 341c2ff3b5d6fac3ced2f6ccd5a7027ad1ac269c..71615725e900c044b810fabea81a9a25bfa54e11 100644 (file)
--- a/ext/pdo/tests/pdo_021.phpt
+++ b/ext/pdo/tests/pdo_021.phpt
@@ -7,7 +7,7 @@ if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
 ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 var_dump($db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(16))'));

diff --git a/ext/pdo/tests/pdo_022.phpt b/ext/pdo/tests/pdo_022.phpt
index 0341a1f7b500707e7e734769dba14c1888ecc5af..2eb1fe73ae03b7354e4b0f1ea0ca8599c6b5413e 100644 (file)
--- a/ext/pdo/tests/pdo_022.phpt
+++ b/ext/pdo/tests/pdo_022.phpt
@@ -17,7 +17,7 @@ if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
 ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(16))');

diff --git a/ext/pdo/tests/pdo_023.phpt b/ext/pdo/tests/pdo_023.phpt
index 96df22cd216c73b35a9cd2650d44d88d083f8055..4cc4437979ba28ff49f78ceb0d4d3b72a3b3c428 100644 (file)
--- a/ext/pdo/tests/pdo_023.phpt
+++ b/ext/pdo/tests/pdo_023.phpt
@@ -7,7 +7,7 @@ if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
 ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 
 class PDOStatementX extends PDOStatement
 {

diff --git a/ext/pdo/tests/pdo_024.phpt b/ext/pdo/tests/pdo_024.phpt
index c0f0bb944aa0f884174bdb282094ea1ac5025601..368722f2bb963fbd19f5b306ced072e22ee7c498 100644 (file)
--- a/ext/pdo/tests/pdo_024.phpt
+++ b/ext/pdo/tests/pdo_024.phpt
@@ -7,7 +7,7 @@ if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
 ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('create table test (id int, name varchar(10))');

diff --git a/ext/pdo/tests/pdo_025.phpt b/ext/pdo/tests/pdo_025.phpt
index d43296bbe00a041b203d0dc0660658674d956a8f..b41c62ffc70b97ef60d4e41057a743acbf990a48 100644 (file)
--- a/ext/pdo/tests/pdo_025.phpt
+++ b/ext/pdo/tests/pdo_025.phpt
@@ -7,7 +7,7 @@ if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
 ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(16))');

diff --git a/ext/pdo/tests/pdo_026.phpt b/ext/pdo/tests/pdo_026.phpt
index 8e3cb7715c2307dd479348df52d6bb7a98950e19..0c8ba6887179d5316bd05ddfd64104f74bfb11c4 100644 (file)
--- a/ext/pdo/tests/pdo_026.phpt
+++ b/ext/pdo/tests/pdo_026.phpt
@@ -7,7 +7,7 @@ if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
 ?>
 --FILE--
 <?php
-require getenv('REDIR_TEST_DIR') . 'pdo_test.php';
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 
 $data = array(
     array('10', 'Abc', 'zxy'),

diff --git a/ext/pdo/tests/pdo_test.inc b/ext/pdo/tests/pdo_test.inc
new file mode 100644 (file)
index 0000000..b571cab
--- /dev/null
+++ b/ext/pdo/tests/pdo_test.inc
@@ -0,0 +1,37 @@
+<?php
+# PDO test framework utilities
+
+class PDOTest {
+       // create an instance of the PDO driver, based on
+       // the current environment
+       static function factory($classname = 'PDO') {
+               $dsn = getenv('PDOTEST_DSN');
+               $user = getenv('PDOTEST_USER');
+               $pass = getenv('PDOTEST_PASS');
+               $attr = getenv('PDOTEST_ATTR');
+               if (is_string($attr)) {
+                       $attr = unserialize($attr);
+               } else {
+                       $attr = null;
+               }
+
+               $db = new $classname($dsn, $user, $pass, $attr);
+
+               // clean up any crufty test tables we might have left behind
+               // on a previous run
+               static $test_tables = array(
+                       'test',
+                       'classtypes'
+                       );
+               foreach ($test_tables as $table) {
+                       $db->exec("DROP TABLE $table");
+               }
+               
+               $db->setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_WARNING);
+               return $db;
+       }
+}
+
+
+
+?>