- Attempt at an unified test suite

diff --git a/ext/pdo/tests/pdo.inc b/ext/pdo/tests/pdo.inc
new file mode 100755 (executable)
index 0000000..6d8fa1e
--- /dev/null
+++ b/ext/pdo/tests/pdo.inc
@@ -0,0 +1,11 @@
+<?php
+
+function set_sql($name,  $query)
+{
+       if (empty($GLOBALS['SQL'][$name]))
+       {
+               $GLOBALS['SQL'][$name] = $query;
+       }
+}
+
+?>

diff --git a/ext/pdo/tests/pdo_001.inc b/ext/pdo/tests/pdo_001.inc
new file mode 100755 (executable)
index 0000000..f56757b
--- /dev/null
+++ b/ext/pdo/tests/pdo_001.inc
@@ -0,0 +1,20 @@
+<?php # vim:ft=php
+
+require_once('pdo.inc');
+
+set_sql('create',  'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10))');
+set_sql('insert1', 'INSERT INTO test VALUES(1, "A")'); 
+set_sql('insert2', 'INSERT INTO test VALUES(2, "B")'); 
+set_sql('insert3', 'INSERT INTO test VALUES(3, "C")'); 
+set_sql('select',  'SELECT * FROM test');
+
+
+$DB->exec($SQL['create']);
+$DB->exec($SQL['insert1']); 
+$DB->exec($SQL['insert2']); 
+$DB->exec($SQL['insert3']); 
+
+$stmt = $DB->query($SQL['select']);
+
+var_dump($stmt->fetchAll(PDO_FETCH_ASSOC));
+?>

diff --git a/ext/pdo/tests/pdo_002.inc b/ext/pdo/tests/pdo_002.inc
new file mode 100755 (executable)
index 0000000..61165ae
--- /dev/null
+++ b/ext/pdo/tests/pdo_002.inc
@@ -0,0 +1,21 @@
+<?php # vim:ft=php
+
+require_once('pdo.inc');
+
+set_sql('create',  'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10))');
+set_sql('insert1', 'INSERT INTO test VALUES(1, "A")'); 
+set_sql('insert2', 'INSERT INTO test VALUES(2, "B")'); 
+set_sql('insert3', 'INSERT INTO test VALUES(3, "C")'); 
+set_sql('select',  'SELECT * FROM test');
+
+
+$DB->exec($SQL['create']);
+$DB->exec($SQL['insert1']); 
+$DB->exec($SQL['insert2']); 
+$DB->exec($SQL['insert3']); 
+
+$stmt = $DB->query($SQL['select']);
+
+var_dump($stmt->fetchAll(PDO_FETCH_NUM));
+
+?>

diff --git a/ext/pdo/tests/pdo_003.inc b/ext/pdo/tests/pdo_003.inc
new file mode 100755 (executable)
index 0000000..cac03a6
--- /dev/null
+++ b/ext/pdo/tests/pdo_003.inc
@@ -0,0 +1,20 @@
+<?php # vim:ft=php
+
+require_once('pdo.inc');
+
+set_sql('create',  'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10))');
+set_sql('insert1', 'INSERT INTO test VALUES(1, "A")'); 
+set_sql('insert2', 'INSERT INTO test VALUES(2, "B")'); 
+set_sql('insert3', 'INSERT INTO test VALUES(3, "C")'); 
+set_sql('select',  'SELECT * FROM test');
+
+
+$DB->exec($SQL['create']);
+$DB->exec($SQL['insert1']); 
+$DB->exec($SQL['insert2']); 
+$DB->exec($SQL['insert3']); 
+
+$stmt = $DB->query($SQL['select']);
+
+var_dump($stmt->fetchAll(PDO_FETCH_BOTH));
+?>

diff --git a/ext/pdo/tests/pdo_004.inc b/ext/pdo/tests/pdo_004.inc
new file mode 100755 (executable)
index 0000000..4cbcf16
--- /dev/null
+++ b/ext/pdo/tests/pdo_004.inc
@@ -0,0 +1,20 @@
+<?php # vim:ft=php
+
+require_once('pdo.inc');
+
+set_sql('create',  'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10))');
+set_sql('insert1', 'INSERT INTO test VALUES(1, "A")'); 
+set_sql('insert2', 'INSERT INTO test VALUES(2, "B")'); 
+set_sql('insert3', 'INSERT INTO test VALUES(3, "C")'); 
+set_sql('select',  'SELECT * FROM test');
+
+
+$DB->exec($SQL['create']);
+$DB->exec($SQL['insert1']); 
+$DB->exec($SQL['insert2']); 
+$DB->exec($SQL['insert3']); 
+
+$stmt = $DB->query($SQL['select']);
+
+var_dump($stmt->fetchAll(PDO_FETCH_OBJ));
+?>

diff --git a/ext/pdo/tests/pdo_005.inc b/ext/pdo/tests/pdo_005.inc
new file mode 100755 (executable)
index 0000000..353f19a
--- /dev/null
+++ b/ext/pdo/tests/pdo_005.inc
@@ -0,0 +1,38 @@
+<?php # vim:ft=php
+
+require_once('pdo.inc');
+
+set_sql('create',  'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(10))');
+set_sql('insert1', 'INSERT INTO test VALUES(1, "A", "AA")'); 
+set_sql('insert2', 'INSERT INTO test VALUES(2, "B", "BB")'); 
+set_sql('insert3', 'INSERT INTO test VALUES(3, "C", "CC")'); 
+set_sql('select',  'SELECT * FROM test');
+
+
+$DB->exec($SQL['create']);
+$DB->exec($SQL['insert1']); 
+$DB->exec($SQL['insert2']); 
+$DB->exec($SQL['insert3']); 
+
+class TestBase
+{
+       public $id;
+       protected $val;
+       private $val2;
+}
+
+class TestDerived extends TestBase
+{
+       protected $row;
+
+       public function __construct(&$row)
+       {
+               echo __METHOD__ . "($row,{$this->id})\n";
+               $this->row = $row++;
+       }
+}
+
+var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS));
+var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS, 'TestBase'));
+var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS, 'TestDerived', array(0)));
+?>

diff --git a/ext/pdo/tests/pdo_006.inc b/ext/pdo/tests/pdo_006.inc
new file mode 100755 (executable)
index 0000000..1b1a682
--- /dev/null
+++ b/ext/pdo/tests/pdo_006.inc
@@ -0,0 +1,20 @@
+<?php # vim:ft=php
+
+require_once('pdo.inc');
+
+set_sql('create',  'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10))');
+set_sql('insert1', 'INSERT INTO test VALUES(1, "A")'); 
+set_sql('insert2', 'INSERT INTO test VALUES(2, "A")'); 
+set_sql('insert3', 'INSERT INTO test VALUES(3, "C")'); 
+set_sql('select',  'SELECT val, id FROM test');
+
+
+$DB->exec($SQL['create']);
+$DB->exec($SQL['insert1']); 
+$DB->exec($SQL['insert2']); 
+$DB->exec($SQL['insert3']); 
+
+var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_NUM|PDO_FETCH_GROUP));
+var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_ASSOC|PDO_FETCH_GROUP));
+
+?>

diff --git a/ext/pdo/tests/pdo_007.inc b/ext/pdo/tests/pdo_007.inc
new file mode 100755 (executable)
index 0000000..dad004a
--- /dev/null
+++ b/ext/pdo/tests/pdo_007.inc
@@ -0,0 +1,19 @@
+<?php # vim:ft=php
+
+require_once('pdo.inc');
+
+set_sql('create',  'CREATE TABLE test(id CHAR(1) PRIMARY KEY, val VARCHAR(10))');
+set_sql('insert1', 'INSERT INTO test VALUES("A", "A")'); 
+set_sql('insert2', 'INSERT INTO test VALUES("B", "A")'); 
+set_sql('insert3', 'INSERT INTO test VALUES("C", "C")'); 
+set_sql('select',  'SELECT id, val FROM test');
+
+$DB->exec($SQL['create']);
+$DB->exec($SQL['insert1']); 
+$DB->exec($SQL['insert2']); 
+$DB->exec($SQL['insert3']); 
+
+var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_NUM|PDO_FETCH_UNIQUE));
+var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_ASSOC|PDO_FETCH_UNIQUE));
+
+?>

diff --git a/ext/pdo/tests/pdo_008.inc b/ext/pdo/tests/pdo_008.inc
new file mode 100755 (executable)
index 0000000..0ae6878
--- /dev/null
+++ b/ext/pdo/tests/pdo_008.inc
@@ -0,0 +1,19 @@
+<?php # vim:ft=php
+
+require_once('pdo.inc');
+
+set_sql('create',  'CREATE TABLE test(id CHAR(1) PRIMARY KEY, val VARCHAR(10))');
+set_sql('insert1', 'INSERT INTO test VALUES("A", "A")'); 
+set_sql('insert2', 'INSERT INTO test VALUES("B", "A")'); 
+set_sql('insert3', 'INSERT INTO test VALUES("C", "C")'); 
+set_sql('select',  'SELECT val, id FROM test');
+
+$DB->exec($SQL['create']);
+$DB->exec($SQL['insert1']); 
+$DB->exec($SQL['insert2']); 
+$DB->exec($SQL['insert3']); 
+
+var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_NUM|PDO_FETCH_UNIQUE));
+// check that repeated first columns overwrite existing array elements
+
+?>

diff --git a/ext/pdo/tests/pdo_009.inc b/ext/pdo/tests/pdo_009.inc
new file mode 100755 (executable)
index 0000000..6fbcf21
--- /dev/null
+++ b/ext/pdo/tests/pdo_009.inc
@@ -0,0 +1,53 @@
+<?php # vim:ft=php
+
+require_once('pdo.inc');
+       
+set_sql('create1', 'CREATE TABLE classtypes(id int PRIMARY KEY, name VARCHAR(10) UNIQUE)');
+set_sql('insert1', 'INSERT INTO classtypes VALUES(0, "stdClass")'); 
+set_sql('insert2', 'INSERT INTO classtypes VALUES(1, "Test1")'); 
+set_sql('insert3', 'INSERT INTO classtypes VALUES(2, "Test2")'); 
+set_sql('create2', 'CREATE TABLE test(id int PRIMARY KEY, classtype int, val VARCHAR(10))');
+set_sql('insert4', 'INSERT INTO test VALUES(1, 0, "A")'); 
+set_sql('insert5', 'INSERT INTO test VALUES(2, 1, "B")'); 
+set_sql('insert6', 'INSERT INTO test VALUES(3, 2, "C")'); 
+set_sql('insert7', 'INSERT INTO test VALUES(4, 3, "D")'); 
+set_sql('select',  'SELECT classtypes.name, test.id AS id, test.val AS val FROM test LEFT JOIN classtypes ON test.classtype=classtypes.id');
+
+$DB->exec($SQL['create1']);
+$DB->exec($SQL['insert1']);
+$DB->exec($SQL['insert2']);
+$DB->exec($SQL['insert3']);
+$DB->exec($SQL['create2']);
+$DB->exec($SQL['insert4']);
+$DB->exec($SQL['insert5']);
+$DB->exec($SQL['insert6']);
+$DB->exec($SQL['insert7']);
+
+class Test1
+{
+       public function __construct()
+       {
+               echo __METHOD__ . "()\n";
+       }
+}
+
+class Test2
+{
+       public function __construct()
+       {
+               echo __METHOD__ . "()\n";
+       }
+}
+
+class Test3
+{
+       public function __construct()
+       {
+               echo __METHOD__ . "()\n";
+       }
+}
+
+var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_NUM));
+var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS|PDO_FETCH_CLASSTYPE, 'Test3'));
+
+?>

diff --git a/ext/pdo_sqlite/tests/connection.inc b/ext/pdo_sqlite/tests/connection.inc
new file mode 100755 (executable)
index 0000000..278a265
--- /dev/null
+++ b/ext/pdo_sqlite/tests/connection.inc
@@ -0,0 +1,7 @@
+<?php
+
+$CONNECTION = 'sqlite::memory:';
+
+$PDO_TESTS = dirname(__FILE__) . '/../../pdo/tests/';
+
+?>
\ No newline at end of file

diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_001.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_001.phpt
index 86c9ce86367673ad7e40c658dcf5a81c8fff5171..1228d23ad336127eba576a56fabea54063f35227 100755 (executable)
--- a/ext/pdo_sqlite/tests/pdo_sqlite_001.phpt
+++ b/ext/pdo_sqlite/tests/pdo_sqlite_001.phpt
@@ -2,20 +2,15 @@
 PDO-SQLite: PDO_FETCH_ASSOC
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded("pdo_sqlite")) print "skip"; ?>
+require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
-$db =new pdo('sqlite::memory:');
+require_once('connection.inc');
+require_once('prepare.inc');
 
-$db->exec('CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, "A")'); 
-$db->exec('INSERT INTO test VALUES(2, "B")'); 
-$db->exec('INSERT INTO test VALUES(3, "C")'); 
+require_once($PDO_TESTS . 'pdo_001.inc');
 
-$stmt = $db->query('SELECT * FROM test');
-
-var_dump($stmt->fetchAll(PDO_FETCH_ASSOC));
 ?>
 ===DONE===
 <?php exit(0); ?>

diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_002.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_002.phpt
index 227f738df76a463d258403666cb2ffa10f8ee497..3d1265efa63ab28f57b38f5a5dbfb0b3b546084b 100755 (executable)
--- a/ext/pdo_sqlite/tests/pdo_sqlite_002.phpt
+++ b/ext/pdo_sqlite/tests/pdo_sqlite_002.phpt
@@ -2,20 +2,15 @@
 PDO-SQLite: PDO_FETCH_NUM
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded("pdo_sqlite")) print "skip"; ?>
+require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
-$db =new pdo('sqlite::memory:');
+require_once('connection.inc');
+require_once('prepare.inc');
 
-$db->exec('CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, "A")'); 
-$db->exec('INSERT INTO test VALUES(2, "B")'); 
-$db->exec('INSERT INTO test VALUES(3, "C")'); 
+require_once($PDO_TESTS . 'pdo_002.inc');
 
-$stmt = $db->query('SELECT * FROM test');
-
-var_dump($stmt->fetchAll(PDO_FETCH_NUM));
 ?>
 ===DONE===
 <?php exit(0); ?>

diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_003.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_003.phpt
index e7cffae940a6f2641e2ab25ce8d0ff7e3fd76bf1..3e393358a59ba07001d2453592c6e68c687b233c 100755 (executable)
--- a/ext/pdo_sqlite/tests/pdo_sqlite_003.phpt
+++ b/ext/pdo_sqlite/tests/pdo_sqlite_003.phpt
@@ -2,20 +2,15 @@
 PDO-SQLite: PDO_FETCH_BOTH
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded("pdo_sqlite")) print "skip"; ?>
+require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
-$db =new pdo('sqlite::memory:');
+require_once('connection.inc');
+require_once('prepare.inc');
 
-$db->exec('CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, "A")'); 
-$db->exec('INSERT INTO test VALUES(2, "B")'); 
-$db->exec('INSERT INTO test VALUES(3, "C")'); 
+require_once($PDO_TESTS . 'pdo_003.inc');
 
-$stmt = $db->query('SELECT * FROM test');
-
-var_dump($stmt->fetchAll(PDO_FETCH_BOTH));
 ?>
 ===DONE===
 <?php exit(0); ?>

diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_004.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_004.phpt
index 2e6e93d920dcac37fbf93192b7efebc86c208f22..9ab0ee148258343d4f9b0053a57bf2de65210cec 100755 (executable)
--- a/ext/pdo_sqlite/tests/pdo_sqlite_004.phpt
+++ b/ext/pdo_sqlite/tests/pdo_sqlite_004.phpt
@@ -2,20 +2,15 @@
 PDO-SQLite: PDO_FETCH_OBJ
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded("pdo_sqlite")) print "skip"; ?>
+require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
-$db =new pdo('sqlite::memory:');
+require_once('connection.inc');
+require_once('prepare.inc');
 
-$db->exec('CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, "A")'); 
-$db->exec('INSERT INTO test VALUES(2, "B")'); 
-$db->exec('INSERT INTO test VALUES(3, "C")'); 
+require_once($PDO_TESTS . 'pdo_004.inc');
 
-$stmt = $db->query('SELECT * FROM test');
-
-var_dump($stmt->fetchAll(PDO_FETCH_OBJ));
 ?>
 ===DONE===
 <?php exit(0); ?>

diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_005.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_005.phpt
index a28c77a2180ddc2ec123eed568cac73af039b962..13593bb5c6e718445175b9773abee3879b73aac3 100755 (executable)
--- a/ext/pdo_sqlite/tests/pdo_sqlite_005.phpt
+++ b/ext/pdo_sqlite/tests/pdo_sqlite_005.phpt
@@ -2,38 +2,15 @@
 PDO-SQLite: PDO_FETCH_CLASS
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded("pdo_sqlite")) print "skip"; ?>
+require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
-$db =new pdo('sqlite::memory:');
+require_once('connection.inc');
+require_once('prepare.inc');
 
-$db->exec('CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, "A", "AA")'); 
-$db->exec('INSERT INTO test VALUES(2, "B", "BB")'); 
-$db->exec('INSERT INTO test VALUES(3, "C", "CC")'); 
+require_once($PDO_TESTS . 'pdo_005.inc');
 
-class TestBase
-{
-       public $id;
-       protected $val;
-       private $val2;
-}
-
-class TestDerived extends TestBase
-{
-       protected $row;
-
-       public function __construct(&$row)
-       {
-               echo __METHOD__ . "($row,{$this->id})\n";
-               $this->row = $row++;
-       }
-}
-
-var_dump($db->query('SELECT * FROM test')->fetchAll(PDO_FETCH_CLASS));
-var_dump($db->query('SELECT * FROM test')->fetchAll(PDO_FETCH_CLASS, 'TestBase'));
-var_dump($db->query('SELECT * FROM test')->fetchAll(PDO_FETCH_CLASS, 'TestDerived', array(0)));
 ?>
 ===DONE===
 <?php exit(0); ?>

diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_006.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_006.phpt
index 8a4084b42474a3929ae91ac1222d202077bd132c..08403b12a2468d71e231d5406ba0e63f60f40d54 100755 (executable)
--- a/ext/pdo_sqlite/tests/pdo_sqlite_006.phpt
+++ b/ext/pdo_sqlite/tests/pdo_sqlite_006.phpt
@@ -2,19 +2,14 @@
 PDO-SQLite: PDO_FETCH_GROUP
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded("pdo_sqlite")) print "skip"; ?>
+require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
-$db =new pdo('sqlite::memory:');
+require_once('connection.inc');
+require_once('prepare.inc');
 
-$db->exec('CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, "A")'); 
-$db->exec('INSERT INTO test VALUES(2, "A")'); 
-$db->exec('INSERT INTO test VALUES(3, "C")'); 
-
-var_dump($db->query('SELECT val, id FROM test')->fetchAll(PDO_FETCH_NUM|PDO_FETCH_GROUP));
-var_dump($db->query('SELECT val, id FROM test')->fetchAll(PDO_FETCH_ASSOC|PDO_FETCH_GROUP));
+require_once($PDO_TESTS . 'pdo_006.inc');
 
 ?>
 ===DONE===

diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_007.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_007.phpt
index 66604b3b0952d51819c7aa6a4fae05551f9201b0..abd0d1d169e5ce4e3f727cf0971c6fd2c694f002 100755 (executable)
--- a/ext/pdo_sqlite/tests/pdo_sqlite_007.phpt
+++ b/ext/pdo_sqlite/tests/pdo_sqlite_007.phpt
@@ -2,19 +2,14 @@
 PDO-SQLite: PDO_FETCH_UNIQUE
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded("pdo_sqlite")) print "skip"; ?>
+require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
-$db =new pdo('sqlite::memory:');
+require_once('connection.inc');
+require_once('prepare.inc');
 
-$db->exec('CREATE TABLE test(id CHAR(1) PRIMARY KEY, val VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES("A", "A")'); 
-$db->exec('INSERT INTO test VALUES("B", "A")'); 
-$db->exec('INSERT INTO test VALUES("C", "C")'); 
-
-var_dump($db->query('SELECT id, val FROM test')->fetchAll(PDO_FETCH_NUM|PDO_FETCH_UNIQUE));
-var_dump($db->query('SELECT id, val FROM test')->fetchAll(PDO_FETCH_ASSOC|PDO_FETCH_UNIQUE));
+require_once($PDO_TESTS . 'pdo_007.inc');
 
 ?>
 ===DONE===

diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_008.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_008.phpt
index 03eb014d81ad678686b6d26d47de0964c78668b6..fc9427d3d0f2a4cae36c25dedf0f4218017db091 100755 (executable)
--- a/ext/pdo_sqlite/tests/pdo_sqlite_008.phpt
+++ b/ext/pdo_sqlite/tests/pdo_sqlite_008.phpt
@@ -2,19 +2,14 @@
 PDO-SQLite: PDO_FETCH_UNIQUE conflict
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded("pdo_sqlite")) print "skip"; ?>
+require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
-$db =new pdo('sqlite::memory:');
+require_once('connection.inc');
+require_once('prepare.inc');
 
-$db->exec('CREATE TABLE test(id CHAR(1) PRIMARY KEY, val VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES("A", "A")'); 
-$db->exec('INSERT INTO test VALUES("B", "A")'); 
-$db->exec('INSERT INTO test VALUES("C", "C")'); 
-
-var_dump($db->query('SELECT val, id FROM test')->fetchAll(PDO_FETCH_NUM|PDO_FETCH_UNIQUE));
-// check that repeated first columns overwrite existing array elements
+require_once($PDO_TESTS . 'pdo_008.inc');
 
 ?>
 ===DONE===

diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_009.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_009.phpt
index cfc975c47ef8c67d705918b49b34e974e697d98a..b1a0e1193b244e1c6d6a81b8af8e510c781a763d 100755 (executable)
--- a/ext/pdo_sqlite/tests/pdo_sqlite_009.phpt
+++ b/ext/pdo_sqlite/tests/pdo_sqlite_009.phpt
@@ -2,49 +2,15 @@
 PDO-SQLite: PDO_FETCH_CLASSTYPE
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded("pdo_sqlite")) print "skip"; ?>
+require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
-$db =new pdo('sqlite::memory:');
+require_once('connection.inc');
+require_once('prepare.inc');
 
-$db->exec('CREATE TABLE classtypes(id int PRIMARY KEY, name VARCHAR(10) UNIQUE)');
-$db->exec('INSERT INTO classtypes VALUES(0, "stdClass")'); 
-$db->exec('INSERT INTO classtypes VALUES(1, "Test1")'); 
-$db->exec('INSERT INTO classtypes VALUES(2, "Test2")'); 
-$db->exec('CREATE TABLE test(id int PRIMARY KEY, classtype int, val VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, 0, "A")'); 
-$db->exec('INSERT INTO test VALUES(2, 1, "B")'); 
-$db->exec('INSERT INTO test VALUES(3, 2, "C")'); 
-$db->exec('INSERT INTO test VALUES(4, 3, "D")'); 
+require_once($PDO_TESTS . 'pdo_009.inc');
 
-class Test1
-{
-       public function __construct()
-       {
-               echo __METHOD__ . "()\n";
-       }
-}
-
-class Test2
-{
-       public function __construct()
-       {
-               echo __METHOD__ . "()\n";
-       }
-}
-
-class Test3
-{
-       public function __construct()
-       {
-               echo __METHOD__ . "()\n";
-       }
-}
-
-$sql = 'SELECT classtypes.name, test.id AS id, test.val AS val FROM test LEFT JOIN classtypes ON test.classtype=classtypes.id';
-var_dump($db->query($sql)->fetchAll(PDO_FETCH_NUM));
-var_dump($db->query($sql)->fetchAll(PDO_FETCH_CLASS|PDO_FETCH_CLASSTYPE, 'Test3'));
 ?>
 ===DONE===
 <?php exit(0); ?>

diff --git a/ext/pdo_sqlite/tests/prepare.inc b/ext/pdo_sqlite/tests/prepare.inc
new file mode 100755 (executable)
index 0000000..46ef5b8
--- /dev/null
+++ b/ext/pdo_sqlite/tests/prepare.inc
@@ -0,0 +1,9 @@
+<?php
+
+require_once('connection.inc');
+
+$SQL = array();
+
+$DB = new pdo($CONNECTION);
+
+?>
\ No newline at end of file

diff --git a/ext/pdo_sqlite/tests/skipif.inc b/ext/pdo_sqlite/tests/skipif.inc
new file mode 100755 (executable)
index 0000000..fc80707
--- /dev/null
+++ b/ext/pdo_sqlite/tests/skipif.inc
@@ -0,0 +1,5 @@
+<?php
+
+if (!extension_loaded("pdo_sqlite")) print "skip";
+
+?>
\ No newline at end of file