From 7649f75cac25e49791bb91398c167bd6be63f645 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 3 Jul 2012 13:00:17 -0400
Subject: [PATCH] switch from pdo_drivers to PDO::getAvailableDrivers

---
 autoload.php                       |   2 +-
 tests/core/core.php                |   2 +-
 tests/databases/mysql/mysql-qb.php |   6 +++++-
 tests/databases/mysql/mysql.php    |   2 +-
 tests/db_files/FB_TEST_DB.FDB      | Bin 802816 -> 802816 bytes
 tests/index.php                    |   4 ++--
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/autoload.php b/autoload.php
index 3f2c570..1846e2c 100644
--- a/autoload.php
+++ b/autoload.php
@@ -68,7 +68,7 @@ function query_autoload($class)
 	}
 	elseif (is_dir($driver_path))
 	{
-		if (in_array($class, pdo_drivers()))
+		if (in_array($class, PDO::getAvailableDrivers()))
 		{
 			array_map('do_include', glob("{$driver_path}/*.php"));
 		}
diff --git a/tests/core/core.php b/tests/core/core.php
index 2815c8f..557534c 100644
--- a/tests/core/core.php
+++ b/tests/core/core.php
@@ -64,7 +64,7 @@ class CoreTest extends UnitTestCase {
 			'sqlite',
 		);
 		
-		$drivers = pdo_drivers();
+		$drivers = PDO::getAvailableDrivers();
 		
 		$num_supported = count(array_intersect($drivers, $supported));
 		
diff --git a/tests/databases/mysql/mysql-qb.php b/tests/databases/mysql/mysql-qb.php
index eb67128..6dbbb1f 100644
--- a/tests/databases/mysql/mysql-qb.php
+++ b/tests/databases/mysql/mysql-qb.php
@@ -43,12 +43,16 @@ class MySQLQBTest extends QBTest {
 
 			$this->db = new Query_Builder($params);
 		}
+		else
+		{
+			die("Error with mysql credentials");
+		}
  	}
 
 	// --------------------------------------------------------------------------
 
 	public function TestExists()
 	{
-		$this->assertTrue(in_array('mysql', pdo_drivers()));
+		$this->assertTrue(in_array('mysql', PDO::getAvailableDrivers()));
 	}
 }
\ No newline at end of file
diff --git a/tests/databases/mysql/mysql.php b/tests/databases/mysql/mysql.php
index d119d3e..4bdd116 100644
--- a/tests/databases/mysql/mysql.php
+++ b/tests/databases/mysql/mysql.php
@@ -40,7 +40,7 @@ class MySQLTest extends DBTest {
 
 	public function TestExists()
 	{
-		$this->assertTrue(in_array('mysql', pdo_drivers()));
+		$this->assertTrue(in_array('mysql', PDO::getAvailableDrivers()));
 	}
 	
 	// --------------------------------------------------------------------------
diff --git a/tests/db_files/FB_TEST_DB.FDB b/tests/db_files/FB_TEST_DB.FDB
index 6a48ead0706afa2115414ee126bc6944e3089749..4914d5f816a837023e8ea844d50625f37de0ecb9 100644
GIT binary patch
delta 1198
zcmZ9LO=uHQ5Xa|jHnz#5^ojJ)i{#V9k3)h5@#b0&YQYZ>!ISk+1Su+t;LRYiH&IX+
z#DfSTc#~S&OAwV<f<z4xC6plBZPQZJRBzsNb|+KQ?vfq;nK$pZ|CzU?Qn6Gj9#gQt
zusaR^FQZG5t_q@;1X!dWfTbSJ1Dx9TDYs{s7Z|YU9uI}0r<Z(@9G@DzX<VaRW4R{c
z8rwBd*KBc3pKJPE6Pqz{+o+}4Xd-^2|K0%;o4u8fU+r@X@tK0QpPwzqcyD>0R@-1&
zW#O)!f<KWgOxp=KWaq(-P>c+KXQiNQrD4)e!wBgF#rswsF4KP*(ub{VxYZLi04=ox
z?{xGKUiWlDRq%nQ$0)ReFo(qjJ?d1*>MJU+K+$bLbR^UlFNqGaY?;?Xs7Ky-_;NuX
zR~|-vJxYNPNxb0eT{>uF_rgcMc9b6wx8q-5XPqF~ixq8mv7!ar>aG`T3nvx{+hS}B
zcXr593vaLK41Vb7oce|*ztfvcE$Nga#q9Ciq-cg&AbK!>pP#tW+yDb;;!vAlO`K?x
z$0j~&6RgRw;bnr&qq9uClsfL60ny9_OSB11Drjurkj8h*#A)Er3UL~EW`#J79#dcO
zH)R~D<K~$4eV7YT$un0$eG{k7oH}#r7+WPyJ>cZ9?CXsBjE`4|BXz<N&3yw~v~X&h
zI5p<fm{VgvwH`kogCUJNQYReIT~1VVI3Ma=brYw`oGNC2P~WONpK8y1-lO_S9I2D}
zh-NM*(J~)7`+VpWRG3r2FSOfM$+CO;a`+Hd@LEUjrLRoR;@JAiE(hj<F(&conm(vr
Vhi#{D#HWMw78iV-e)>zF_y-8o8K3|F

delta 1192
zcmZ9LPiPZS5XR?icGD)0(kIeGK_qD!+hdD@cr(V61^-b5PgZE~QWcbfH-m>gS=7@g
zUZR8&C1|Lz39?i@coaS8#Z!|uDMf7&deDnFZ)c~r&61t{@^<EzZ|1#XalBX@Kds={
zSWgE2e~d21B4uNc26#(f07pIk1~7T_(@18JUoha%H5Cd)_aOZ$J+;t($M{D1#_>(e
zH?D6y-^6{><C|XJBo<B5HR@f%OC@jjHs(f?H+vpTCH%4E;+S@8mmVg#wA?SK{V*NN
z!gM?Z6)y{QHw9bXC~UcXaNiw*1Mv*3(({a)fs^hiq$qy&GVq0d`%QVr<3nMo$yguU
zjUB>!8+rh5E$fsj<D+FgL7`*AJdU??K368EOO)V%qRW8jSg5aE7j0Lq<5KiKg!;()
z625NfGpdAMTjwbx*7Y!6ZR-(wp4-$T7_{}UdWuihbsEpN^iWPJ2vM{f5k(8p&cpsg
zAqH4jA!5M9fK3H#YRQ^9h%Z-lHYa(^xjZA9IZildTeshGuM}=HcX0rkIM5+Z6AK-3
z*2HHW>RQv98pgpc8GM7eE_G1yxMK!HGZ!4uCiJJEzKcT|KXi#x$ALBC)bZjPaq7(Z
zxIvsn{6#A{$>YA5?K;c_Pu7{MptgroV@{1ZH9M&ZRogM71v{jCPV$5!n)?Q>XyH`%
zaH`CyGN;OZsyqC=z;oY;BYDCR9dSI-;e4ofl|7sab1InqL4B+6d@4KU^BmPr;z*v%
zM>KOmiI(}uj_3WRpv;^yex+*rWR>01dBHy`)W<T;Zs@}l!tFt0o7jFc;=sHeV;WCw
W>J!n~h>nX(n~)Dk<L{<+&i(^oO%L?|

diff --git a/tests/index.php b/tests/index.php
index e685516..17a3826 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -37,7 +37,7 @@ require_once(QTEST_DIR . '/core/db_qb_test.php');
 $src_path = QBASE_DIR.'drivers/';
 $test_path = QTEST_DIR.'/databases/';
 
-foreach(pdo_drivers() as $d)
+foreach(PDO::getAvailableDrivers() as $d)
 {
 	// PDO firebird isn't stable enough to
 	// bother, so skip it.
@@ -48,7 +48,7 @@ foreach(pdo_drivers() as $d)
 
 	$src_dir = "{$test_path}{$d}";
 
-	if(is_dir($src_dir))
+	if (is_dir($src_dir))
 	{
 		require_once("{$test_path}{$d}/{$d}.php");
 		require_once("{$test_path}{$d}/{$d}-qb.php");