From db47f15fdd62e965610d5b28698a0fe3f6017b4f Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 10 Apr 2012 22:10:33 -0400
Subject: [PATCH] Rearrange db tests

---
 .../databases/{ => firebird}/firebird-qb.php  |   0
 tests/databases/{ => firebird}/firebird.php   |   0
 tests/databases/{ => mysql}/mysql-qb.php      |   0
 tests/databases/{ => mysql}/mysql.php         |   0
 tests/databases/{ => odbc}/odbc-qb.php        |   0
 tests/databases/{ => odbc}/odbc.php           |   0
 tests/databases/{ => pgsql}/pgsql-qb.php      |   0
 tests/databases/{ => pgsql}/pgsql.php         |   0
 tests/databases/{ => sqlite}/sqlite-qb.php    |   0
 tests/databases/{ => sqlite}/sqlite.php       |   0
 tests/index.php                               |   6 ++----
 tests/test_dbs/FB_TEST_DB.FDB                 | Bin 933888 -> 933888 bytes
 12 files changed, 2 insertions(+), 4 deletions(-)
 rename tests/databases/{ => firebird}/firebird-qb.php (100%)
 rename tests/databases/{ => firebird}/firebird.php (100%)
 rename tests/databases/{ => mysql}/mysql-qb.php (100%)
 rename tests/databases/{ => mysql}/mysql.php (100%)
 rename tests/databases/{ => odbc}/odbc-qb.php (100%)
 rename tests/databases/{ => odbc}/odbc.php (100%)
 rename tests/databases/{ => pgsql}/pgsql-qb.php (100%)
 rename tests/databases/{ => pgsql}/pgsql.php (100%)
 rename tests/databases/{ => sqlite}/sqlite-qb.php (100%)
 rename tests/databases/{ => sqlite}/sqlite.php (100%)

diff --git a/tests/databases/firebird-qb.php b/tests/databases/firebird/firebird-qb.php
similarity index 100%
rename from tests/databases/firebird-qb.php
rename to tests/databases/firebird/firebird-qb.php
diff --git a/tests/databases/firebird.php b/tests/databases/firebird/firebird.php
similarity index 100%
rename from tests/databases/firebird.php
rename to tests/databases/firebird/firebird.php
diff --git a/tests/databases/mysql-qb.php b/tests/databases/mysql/mysql-qb.php
similarity index 100%
rename from tests/databases/mysql-qb.php
rename to tests/databases/mysql/mysql-qb.php
diff --git a/tests/databases/mysql.php b/tests/databases/mysql/mysql.php
similarity index 100%
rename from tests/databases/mysql.php
rename to tests/databases/mysql/mysql.php
diff --git a/tests/databases/odbc-qb.php b/tests/databases/odbc/odbc-qb.php
similarity index 100%
rename from tests/databases/odbc-qb.php
rename to tests/databases/odbc/odbc-qb.php
diff --git a/tests/databases/odbc.php b/tests/databases/odbc/odbc.php
similarity index 100%
rename from tests/databases/odbc.php
rename to tests/databases/odbc/odbc.php
diff --git a/tests/databases/pgsql-qb.php b/tests/databases/pgsql/pgsql-qb.php
similarity index 100%
rename from tests/databases/pgsql-qb.php
rename to tests/databases/pgsql/pgsql-qb.php
diff --git a/tests/databases/pgsql.php b/tests/databases/pgsql/pgsql.php
similarity index 100%
rename from tests/databases/pgsql.php
rename to tests/databases/pgsql/pgsql.php
diff --git a/tests/databases/sqlite-qb.php b/tests/databases/sqlite/sqlite-qb.php
similarity index 100%
rename from tests/databases/sqlite-qb.php
rename to tests/databases/sqlite/sqlite-qb.php
diff --git a/tests/databases/sqlite.php b/tests/databases/sqlite/sqlite.php
similarity index 100%
rename from tests/databases/sqlite.php
rename to tests/databases/sqlite/sqlite.php
diff --git a/tests/index.php b/tests/index.php
index f339cbc..c1a27f3 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -59,8 +59,7 @@ foreach(pdo_drivers() as $d)
 	if(is_dir($src_dir))
 	{
 		array_map('do_include', glob($src_path.$d.'/*.php'));
-		require_once("{$test_path}{$d}.php");
-		require_once("{$test_path}{$d}-qb.php");
+		array_map('do_include', glob($test_path.$d.'/*.php'));
 	}
 }
 
@@ -68,6 +67,5 @@ foreach(pdo_drivers() as $d)
 if(function_exists('fbird_connect'))
 {
 	array_map('do_include', glob($src_path.'firebird/*.php'));
-	require_once("{$test_path}firebird.php");
-	require_once("{$test_path}firebird-qb.php");
+	array_map('do_include', glob($test_path.'firebird/*.php'));
 }
\ No newline at end of file
diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB
index cf3d6330a08817e1fd6b3f21c9f40b0044356162..efca51afe19d46b1f6bba3a74a5e2deea6bd3754 100755
GIT binary patch
delta 97
zcmZo@uxx0sWMyQqG)SGuDle$0$N&UPjI(bsFoc+&SLbOoZ8c?VHDziwWo|WPX*FeS
zHDzlxWp6d*Xf@^BYRYw9o>6H#s{&Uz2P6N+z{Tus23&0h+-(LtZ3eu{4EO{9eViA;

delta 97
zcmZo@uxx0sWMyQqG)S4qDle#@$N&UPjI(bsFoc+&SLbdtZ8c?VHDziwWo|WPX*FeS
zHDzlxWp6d*Xf@^BYRYw9o>6f-s{&Uz2P5;wz{Tus23&0h+-(LtZ3eu{4EO{9dz%-r