From d9a4b5fbe5408061265f97255595f90201d61369 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Thu, 26 Jul 2012 17:21:24 +0000
Subject: [PATCH] Added exception for invalid drivers

---
 classes/query_builder.php     |  44 ++++++++++++++++++++++++++++++----
 tests/core/core.php           |   6 ++---
 tests/core/db_qb_test.php     |  23 ++++++++++++++++++
 tests/db_files/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes
 4 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/classes/query_builder.php b/classes/query_builder.php
index 0d28e82..d9a22e4 100644
--- a/classes/query_builder.php
+++ b/classes/query_builder.php
@@ -13,6 +13,26 @@
 
 // --------------------------------------------------------------------------
 
+/**
+ * Generic exception for bad drivers
+ *
+ * @package Query
+ * @subpackage Query
+ */
+class BadDBDriverException extends UnexpectedValueException {}
+
+// --------------------------------------------------------------------------
+
+/**
+ * Generic exception for bad connection strings
+ *
+ * @package Query
+ * @subpackage Query
+ */
+class BadConnectionException extends UnexpectedValueException {}
+
+// --------------------------------------------------------------------------
+
 /**
  * Convienience class for creating sql queries - also the class that
  * instantiates the specific db driver
@@ -185,6 +205,12 @@ class Query_Builder {
 		{
 			$dsn = strtolower($dbtype).':'.$dsn;
 		}
+		
+		// Make sure the class exists
+		if ( ! class_exists($dbtype))
+		{
+			throw new BadDBDriverException('Database driver does not exist, or is not supported');
+		}
 
 		// Create the dsn for the database to connect to
 		switch($dbtype)
@@ -213,14 +239,22 @@ class Query_Builder {
 			break;
 		}
 		
-		// Create the database connection
-		if ( ! empty($params->user))
+		
+		try 
 		{
-			$this->db = new $dbtype($dsn, $params->user, $params->pass);
+			// Create the database connection
+			if ( ! empty($params->user))
+			{
+				$this->db = new $dbtype($dsn, $params->user, $params->pass);
+			}
+			else
+			{
+				$this->db = new $dbtype($dsn);
+			}
 		}
-		else
+		catch(Exception $e)
 		{
-			$this->db = new $dbtype($dsn);
+			throw new BadConnectionException('Connection failed, invalid arguments');
 		}
 
 		// Set the connection name property, if applicable
diff --git a/tests/core/core.php b/tests/core/core.php
index 557534c..f645552 100644
--- a/tests/core/core.php
+++ b/tests/core/core.php
@@ -24,7 +24,7 @@ class CoreTest extends UnitTestCase {
 	 * @access public
 	 * @return void
 	 */
-	function __construct()
+	public function __construct()
 	{
 		parent::__construct();
 	}
@@ -37,7 +37,7 @@ class CoreTest extends UnitTestCase {
 	 * @access public
 	 * @return void
 	 */
-	function TestPHPVersion()
+	public function TestPHPVersion()
 	{
 		$this->assertTrue(version_compare(PHP_VERSION, "5.2", "ge"));
 	}
@@ -50,7 +50,7 @@ class CoreTest extends UnitTestCase {
 	 * @access public
 	 * @return void
 	 */
-	function TestHasPDO()
+	public function TestHasPDO()
 	{
 		// PDO class exists
 		$this->assertTrue(class_exists('PDO'));
diff --git a/tests/core/db_qb_test.php b/tests/core/db_qb_test.php
index d4b9de8..55279ce 100644
--- a/tests/core/db_qb_test.php
+++ b/tests/core/db_qb_test.php
@@ -425,6 +425,29 @@ abstract class QBTest extends UnitTestCase {
 		$this->assertTrue(is_numeric($this->db->num_rows()));
 	}
 	
+	// --------------------------------------------------------------------------
+	// ! Other Tests
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Handles invalid drivers
+	 */
+	public function TestBadDriver()
+	{
+		$params = array(
+			'host' => '127.0.0.1',
+			'port' => '3306',
+			'database' => 'test',
+			'user' => 'root',
+			'pass' => NULL,
+			'type' => 'QGYFHGEG'
+		);
+		
+		$this->expectException('BadDBDriverException');
+		
+		$this->db = new Query_Builder($params);
+	}
+	
 }
 
 // End of db_qb_test.php
\ No newline at end of file
diff --git a/tests/db_files/FB_TEST_DB.FDB b/tests/db_files/FB_TEST_DB.FDB
index 702a59673968e8f30dd272b2af26214bb2cfcdd3..08cb9f115e128dd034cde28f5d0a1b1c2787cdc4 100644
GIT binary patch
delta 1166
zcmZXTO=uHA6vy9el78f|*(pJc3X%_Ft0E*Ih|q(<V@unE2ttrW76}q0H1Q^wita%W
z6c4Z9MG(BygH>q!!dsySK|Bc3QwW9P#-@5JLcrObeQk)l?7aDh$@{&pX*P?^W^qoy
zg~G=i96S=6kx==zmIbJ*55N%5HUTc5|2nyFL?4h~sMijJP-`vwHe<iB?nze)R~oL2
zxH9U>m@7wIIqJ$WSB|gAcvOl;E0&JG9D90Ej<i;$;`5_!A--0?=<B<4aqXMeD<TQ^
z%{=_Drr@2GhR0SOYRb-9S(vs=NLe}fotT0zi5z@Nn6RvDLw&P}JWMO?KYL~t8m0-a
z%#(qRfefr4b1c~DMS!Fi9v%`kdhcO|j&5U;c04?+et6Kv8L>#;+IT!>^dZ@&Mi<j1
zzdWDSzat>jtIOqUUkz&MYo`y@@O*GW?DeaZ_i$cR>9&WLlv&-y6ZGg8POAN%p4wmS
zsQoP}{lo$-bun3D4@O8}%@ME;B5>;Kl_6q96Dyin@rfDQ^zgK(XyW*mBHpAY+e~B+
zOk^DmBVf%$XNc%%qN9n<K#tBpjyGtjqiP%J!(Lch_QPD(%w=r_wXLt)LtI;PZTh~W
zYHRCE4|;0*@ELKPid&d5>g&3p?1an7nuB1i8@d7IA!u1c%R1TeK(gh5WUu)R%@`XH
zK+m$1pn__8SaT4pgCJ<a!&UmQiz&Zt=jd+_kI|_v7U^LJQ?11=8pZ_ACC^z+hgI`y
zk<;^ZhMs$v+CRyx;n}C<9-6@|u-IuBCattFA6|`pH$3S7U6q01M!M6*R5;<S{w_uq
F{sHxB9OM81

delta 1893
zcma)-T}V_x6vxlp-K*<8u3qy4`ykv8KLP`n*0NY?D~ZJx+r$>39*P1B#059#(WQs`
zoDfV9JrzA?S@sY?4}wqCYtn-&lAyHWn*<A;Gk0gzZ9_-y9shS`&Ya&lGiP(TNG=x{
z7I3!jWe9efjX6(AaX%IWxJeIyA)YS*jGp<{J#^TeV1q$_x0Mj|9t*w;+<x2m*mi8;
z*oI?!9NX*IreoJQcCBOk9J}s=ZFy~RYu@azUi)UR->7x^tPg$YeKT>|a;@rjS~Nr0
z>V*6Coe=hS0QiG2SKk8<u><DN4=D^nFNWY}eF$EWenPz$dtliL!Bf&7X)U)F%MVGb
zOZ{(xt$O)=8Cyh3ZWZvV7?F`Y9-sCU)sXu#)Wql)#xm%ke!+l9G)1BKtiB2U23oTc
zG^Vx9y3T-PX+B#J&|GBgHUos%E<&9bOc>9MPsp!%#NNz>jGo|Q7ibD^<D-ZADIZK`
zCQm-fOx-I&QkpB+5zb~$=@nwv3SLD|T0nneQqF8*xTm}|(3WJIG|w_iwoSM*k<DBn
zyFWIuTYg%>uo#vzs~EVeH{e+8EHvDO^eqzAoL(}?anRaRp@|wqjRgss!*OI61Z)=*
z@_ino$4VAUxP+~7vkM6qm*S<H!i7UBKqXwV)ei~A4ag&_*z7UW!p(JpslxKXDt3z@
zxwS@A6#Y_DRM|yZUCy?m(q7gmFQM$U$(jiCcmr#q8myoiWU9b)Q+XraPvw<*-mDrZ
z8_`W25tD-&{Q|@S(4dY?d7RTxB?LP*DB$wNCbqU&dz?@Qpd6e*6&&G}Rvx>=6)Aon
zC_EaMQ^+)0H?t-Rt<`0q@Wd;^6W=%K@dGD4?k0V*usi8-H|ceGO8O-}%6+3%vaH=w
zXO%FtR%ex5)>>f_Mr;p8b|JP8#v;THj1f~9ZItC*ZEvz-Zn7*lS?6Vbr8<^&Q)6kZ
zv9#7$1ADL*VL)NElOI)2s%%=vS(z?iyIfkwsQgpFqw>TCM&!9Xw$5iZ&@`HKIaJr2
zYFUbHUZcX>x`vmjQx}zTR#U1p<bqzJ+^h@&X?30DvjY0NXg0f6S-`Xf1r`K}dF-UU
s)cxn95YZEKk=DEXuegoKi@z`s($ly`@U{E**TF5cUh*qB&qXx#7dv_^+W-In