From 9d8d07958f260c2117051356e7f9b6afcccf38ad Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Fri, 27 Jul 2012 16:05:29 +0000
Subject: [PATCH] Minor tweaks to exceptions

---
 classes/query_builder.php     |   2 +-
 tests/core/db_qb_test.php     |  20 +++++++++++++++++++-
 tests/db_files/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/classes/query_builder.php b/classes/query_builder.php
index d9a22e4..1ea52d5 100644
--- a/classes/query_builder.php
+++ b/classes/query_builder.php
@@ -254,7 +254,7 @@ class Query_Builder {
 		}
 		catch(Exception $e)
 		{
-			throw new BadConnectionException('Connection failed, invalid arguments');
+			throw new BadConnectionException('Connection failed, invalid arguments', 2, $e);
 		}
 
 		// Set the connection name property, if applicable
diff --git a/tests/core/db_qb_test.php b/tests/core/db_qb_test.php
index 55279ce..c0d9ca1 100644
--- a/tests/core/db_qb_test.php
+++ b/tests/core/db_qb_test.php
@@ -426,7 +426,7 @@ abstract class QBTest extends UnitTestCase {
 	}
 	
 	// --------------------------------------------------------------------------
-	// ! Other Tests
+	// ! Error Tests
 	// --------------------------------------------------------------------------
 	
 	/**
@@ -448,6 +448,24 @@ abstract class QBTest extends UnitTestCase {
 		$this->db = new Query_Builder($params);
 	}
 	
+	// --------------------------------------------------------------------------
+	
+	public function TestBadConnection()
+	{
+		$params = array(
+			'host' => '127.0.0.1',
+			'port' => '3306',
+			'database' => 'test',
+			'user' => NULL,
+			'pass' => NULL,
+			'type' => 'mysql'
+		);
+		
+		$this->expectException('BadConnectionException');
+		
+		$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 08cb9f115e128dd034cde28f5d0a1b1c2787cdc4..7b5b0a692c2e54a7dc0dd3d479d9c42a85b260c7 100644
GIT binary patch
delta 618
zcmZ9Ize^)Q6vy9eHoCiy;D{i4cSwF15=1bm#LkfRyi*hl3z0($Ei7b_MHXEwrn1rI
zfm-+nSg6M(3Ub#RTzU0bnI#A!?kZSZBXQPs5b_=~?|p}v?`LK_uk3l{FAT;?e{%31
z9KFPwimICh*pdT4V+U6NGoybC)BW)V4w}q`SHa}$X1`|^&bqd_;7o8$@Py#H;7P$d
z1n(5w5ZtVBOXtk1C)3ukk!ZDAr&FIhMaim_P(PWUvtnm8&$1q{jXa!Nd6>j3=vai`
zW*Tfv!;vYqm4ac+fotYq#w<cf)+aLs*H#V;GY?JKN3m$6;LxalyGG6Ej-K@Mb(sNU
z|DRp@(ZH|FrKFElStbI^(29>kvVRP4kS=^IuuUpAaDaZ@V!omr<awF#Cq<5lHmyZ^
zk%7}jbYh|t6CK(OCGkU35*_*%O5$=;5;th-4yzS)SizLm-(X5BnB4}mW0)Po><BhO
zZh)Vd9l;88>Ej?<r^=1I#M&KZGs-~`l~zQXmhSP9_CxHW)c|+M5Ah?J4e9j|pibi<
P_L6mvef8B4_a<Ke|9y|u

delta 615
zcmZ9HJxIeq6oB8Qt*v>aIT1ufq)jarm+B;ngW9!Jg&;wSi0I%Ju%kl|IoCQ}!Ohu0
z{EMPEI18@gWQ&UwQ@eF3cxieleaGFqkGuCip5x3o&P;*8-1I{V{(_<t>XM&r17Kfl
z0EL{s1DLa~ldB`a2MUT<TOA<cw2iCe)}?+(86}J=jD{EuGa6yEkI^WjF-H4usT!uF
z<VF(edCa}esQKt|JFB|wEJiOj3u@3=p6g@~j<htq=^41w6HwOEV2hmB4Oq}M7}itp
z6VJd)JOz(&4Jsm+#LmaluprovmS#Xn)8Jflw?9yc4HU&VPn{<MgtXd4epAI2Qsj{u
z=0rMaV3r?vI415*4=4D24JXMauhuZhpTE#pk{v|7SOAhkJ*@b=L%`}WT7l6DjFxXq
z^3hM6B35AB`xM3vzE;QFk}Q@o$>FX{az`#?W{=DaWM&{U|BYw<8*kkoZ=5LHuH!^f
r_K;4=k*?F^yWiO4XCJuCD;{oh&%gb680L!&9OCm;oOjC&v{!!t&i0OB