From 49aa73196f29a42fc1fc25823a5c9085b32847b3 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 10 Apr 2012 15:47:59 -0400
Subject: [PATCH] Fix minor edge case

---
 sys/db/query_builder.php      |   8 ++++++--
 tests/test_dbs/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys/db/query_builder.php b/sys/db/query_builder.php
index c74c5db..cb79fd2 100644
--- a/sys/db/query_builder.php
+++ b/sys/db/query_builder.php
@@ -54,7 +54,7 @@ class Query_Builder {
 	private $query_map;
 
 	// Convenience property for connection management
-	public $conn_name;
+	public $conn_name = "";
 
 	/**
 	 * Constructor
@@ -115,7 +115,11 @@ class Query_Builder {
 			$this->db = new $dbtype($dsn);
 		}
 		
-		$this->conn_name = $params->name;
+		if (isset($params->name))
+		{
+			$this->conn_name = $params->name;
+		}
+		
 
 		// Make things just slightly shorter
 		$this->sql =& $this->db->sql;
diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB
index 1983a70b6d93ca2475dc003222589396f0ec550e..5e0d1f241f3458d4fe3dd15983116aee3d76b42f 100755
GIT binary patch
delta 392
zcmYL@J4gdT5Qb+i7n9pTT|q%on9IvZK*&KvL<=94g+(A(Sp;mgv{N`lwy`lNOkrhb
zVWAeePAu*0t&&(McRm7QFjc%e65VD0osVHY#<nfnwl)wJifd{3Ka%W7pMt+*0`&X`
zpyBxwKxO_h-%bP!AVKqQHLTIkj?+AeCP!=4vqPyQDyb<MQBqejs^pN8F(u<l8g(gj
zsX@vaGR1oQbXi7k%2zQ}6!jwM*NgXhDEx~}6i_m9A!m(YI1(mQMH-ew2FAq<w2cfr
z`28(ox>nBd>nBY*`whB`j|F?*g>wk#Z`$J(mr`i(wo9|v<C;q*ntbb08oPYZpcE%Q
zsDMA5@+iyQCgt&)cRiY7exscA)%R(>4U+%^4(te4X}}Qj9K7(wv+o>vrvjTE33gkw
Q$~!?-Xwigo?9pE37oW3S(EtDd

delta 395
zcmYL_ze@vA49An}_16p9=g`H$zP7Zw2v?zqn>Z=Op-^<~DALtU;ShX_OAA5<cM%7v
zOAi<S1x1{k?rK4<rMik(@UA~JAwNFkn+&n-l5LlE5jLz+4*pG&9hp*CdkSC}1b~5;
zuK>06$7OFZWB>_9;Pr8jLGC$TGnz@Y>KCU{OVrZPGNPraWmL<UmT@f;S|&SEn9}%A
zPE3iN1g7q)?YOo?$0D<xzc<I{{?Z<%U{e&vY>7EI5XDwCt(v5uK{?o_JSbX$ACZTb
zsVvm8`$@_<cIi67Pac^#&t8`*NSy7`5?9`+u$EK+4}sPI47?084hivVG-H^|ag^cP
z9x1-@sJIaRBwU^h4H$CSrz}Qz-=|d^@|jNxGkoP!4&V92r2>EV$>L|1wzx4M!H0cH
KJLdyBs{I1S@mZw+