From f83e93541cc86f2db965c2b9e02cbc212a85276f Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 13 Mar 2012 13:38:47 -0400
Subject: [PATCH] Query builder delete tests

---
 sys/db/query_builder.php        |   7 +++++--
 tests/databases/firebird-qb.php |   9 ++++++++-
 tests/databases/sqlite-qb.php   |   9 ++++++++-
 tests/test_dbs/FB_TEST_DB.FDB   | Bin 802816 -> 802816 bytes
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/sys/db/query_builder.php b/sys/db/query_builder.php
index fce6e5b..ff8a286 100644
--- a/sys/db/query_builder.php
+++ b/sys/db/query_builder.php
@@ -508,7 +508,10 @@ class Query_Builder {
 	public function delete($table, $where='')
 	{
 		// Set the where clause
-		$this->where($where);
+		if ( ! empty($where))
+		{
+			$this->where($where);
+		}
 
 		// Create the SQL and parameters
 		$sql = $this->_compile("delete", $table);
@@ -618,7 +621,7 @@ class Query_Builder {
 			break;
 		}
 		
-		//echo $sql.'<br />';
+		echo $sql.'<br />';
 		
 		return $sql;
 	}
diff --git a/tests/databases/firebird-qb.php b/tests/databases/firebird-qb.php
index 25b17fb..fd543ce 100644
--- a/tests/databases/firebird-qb.php
+++ b/tests/databases/firebird-qb.php
@@ -32,7 +32,7 @@ class FirebirdQBTest extends UnitTestCase {
 		$params->pass = 'masterkey';
 		$this->qb = new Query_Builder($params);
 		
-		//echo '<hr /> Firebird Queries <br />';
+		echo '<hr /> Firebird Queries <hr />';
 	}
 
 	function TestQBGet()
@@ -126,4 +126,11 @@ class FirebirdQBTest extends UnitTestCase {
 			
 		$this->assertTrue($query);
 	}
+	
+	function TestDelete()
+	{
+		$query = $this->qb->where('id', 4)->delete('create_test');
+			
+		$this->assertTrue($query);
+	}
 }
\ No newline at end of file
diff --git a/tests/databases/sqlite-qb.php b/tests/databases/sqlite-qb.php
index f080edb..3a6e7f3 100644
--- a/tests/databases/sqlite-qb.php
+++ b/tests/databases/sqlite-qb.php
@@ -28,7 +28,7 @@
 		$params->host = 'localhost';
 		$this->qb = new Query_Builder($params);
 		
-		//echo '<hr /> SQLite Queries <br />';
+		echo '<hr /> SQLite Queries <hr />';
  	}
 	
 	function TestGet()
@@ -120,4 +120,11 @@
 			
 		$this->assertIsA($query, 'PDOStatement');
 	}
+	
+	function TestDelete()
+	{
+		$query = $this->qb->where('id', 4)->delete('create_test');
+			
+		$this->assertIsA($query, 'PDOStatement');
+	}
 }
\ 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 776d51a74b91ead9ce61abaacc46fe8cdae456d8..b176515eb0e82b6130e385fb4ca101cd2ceaa70c 100755
GIT binary patch
delta 1114
zcmbtTO=uHA6n?YW{Ft3)C!rOkrY7c}HjvneKbJ@^3W6n2dMidKo?-*ZK@Syzhdp_)
zcz8lj9z2O)wKP(!O$8-rj2E$3A~XjPyy($`0cUo1OdEUiEwgXG-8b{T@4dIRTDDfp
zUM6rh6AD1zm{xPxNce3A(BTU}A<H`eGp9c!B0ejCfx@q%2?)P$vuEMrQ~fqG7%`Y)
zFo(fZgE<Z6GML+79)lfPV_ub!FLh_gdq%x?p81GlrLd|Q8Sh#~Q-9{Kh=XiXxt}Eg
zxZ{h%t{#F_?)TaYJp%XnD(NY>$bCqUFBOiCEc%B2M!n)sDiG*kAxVR-7MGMgiATcp
zxYFCfZk&b>zvl1yNu40XE|igd)rQGuOebg*uTRi%@(FJx=-9OlQ59*5h%V>1#D0Y@
z%V%>R`D>Y)RGT2NgGY!Mi4_~S?Raqlsa7Z3xD}%@oJ!LmPDiQcAkgkBxKP2?2|DWH
z!KZpHd=TX--U?+o$!ougci2tRsJm%0Z{qGZElQf0P0`FuIbR;+{>J9wF}XBBVz<pz
zVv%0#Z47X42<~C5PtYN}l%~T{K*JIshyvIxcxjOrE$G{R@*5WUO*3TEBEK%kkIf#`
z3X{^_Ry-e&Be7X(o>XGLEoVhgieVr^gI?l<tEFl=4^IS%Y4X@A8svTt7VVLpMa-J`
zCb8M@d6<;gY&iMVlh|VM-to|CcqLA6;(D4MLsx=k@OzSu;#`D|<6?q(@mz|I)Rz;q
z>+*|VQVf`_qSQf>q*K0<hmY<;`bN1j&wtzg#QfjP#||p=KQmwV-z7ivrK0~29!|;h

delta 1161
zcmaJ=O=uHA6n?YWP15X0Cfb%t(01GAUv0LgsEBB(SVU=wNVTFQ6-2~Hp!L{8^sr}p
z@f~_F7rkl~8a$}9UV0Jldawbd2!bAq7;t`elJ=mp%+7u@``&)vx9`<zZms4{5jc_m
z9)r$cb}ir|vDO*DQ$7I<viu3)^0AMp?LF!R1_r;%5)gi`vsX^}W%MEQ81b0lv4F=+
zk69iIdMxCzu*bSqS;S=IS;HEL95+dHrMPZ;`N(SCHh;y>iX{Fp`8q?oCAuF>E*1CR
ztA_?)F*F2M`P?}Ug)$K4dz-;zd;21PUgyXJ!Y>B5xCDU%5<?q{Qv&X&J_rB2gd|N9
zdpm@}Jc&5O9~s(5N?1%&$GBa6JVN`8&<$)Rsgv6fhPC*V!x9lu5d&cH$=8+zbCrea
z>9y<FOw(yHi*AMv-mItqZn6A`AwvumQZ>LWT=Cf}HSk_zrG|mVB9g%5yv9n60Y#z4
z>3zfb&9o&cMQ%YUDoRC!;O885$g~iYz)J~w0H1H!VWT=F7!Tv?EX|P%g7!hYdxXZY
z{>_e_s|b?kcakLAEsZ6qg$>YHSq^QiNCHeqlEHVJq&tc)hG>#MO-Ne!Hc6x1Jf|Sv
znPX(UWBgp(MQObCJ0xE8jj#H~!x?4#DQP@DNl|C~q|aNK2cWSuoBuzJrP-9UvE<F|
z9Fx2Ug}IaS1)fX|o=$Qo`~h=~d}t|6aV#CCb^wkRgs^^FwU&&)FAmM(gCxC!*%8`@
zMv4|N;?TG>9T!tHg4Z0{(^yW?W>6YGD~;E+`>$HpjQ&@UI*0BD+}yH<yYw#L%2&H*
ppKwSNsr(1BFjbob2&fL|-Q5AZdq&oL&aZh=X~Z6ppV6gq>@RsVwxR$4