From 49503dfb3d915f8d92da399c5071682f8337f438 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Mon, 16 Apr 2012 13:43:41 -0400
Subject: [PATCH] Start of last unimplemented methods

---
 classes/query_builder.php     | 131 ++++++++++++++++++++++++----------
 tests/db_files/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes
 2 files changed, 93 insertions(+), 38 deletions(-)

diff --git a/classes/query_builder.php b/classes/query_builder.php
index 4cbb18a..17f8553 100644
--- a/classes/query_builder.php
+++ b/classes/query_builder.php
@@ -481,6 +481,34 @@ class Query_Builder {
 
 		return $this;
 	}
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Generates a 'Having' clause
+	 *
+	 * @param mixed $key
+	 * @param mixed $val
+	 * @return $this
+	 */
+	public function having($key, $val=array())
+	{
+		// @todo Implement having
+	}
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Generates a 'Having' clause prefixed with 'OR'
+	 *
+	 * @param mixed $key
+	 * @param mixed $val
+	 * @return $this
+	 */
+	public function or_having($key, $val=array())
+	{
+		// @todo Implement or_having
+	}
 
 	// --------------------------------------------------------------------------
 	// ! 'Where' methods
@@ -718,6 +746,44 @@ class Query_Builder {
 	// --------------------------------------------------------------------------
 	// ! Other Query Modifier methods
 	// --------------------------------------------------------------------------
+	
+	/**
+	 * Sets values for inserts / updates / deletes
+	 *
+	 * @param mixed $key
+	 * @param mixed $val
+	 * @return $this
+	 */
+	public function set($key, $val)
+	{
+		// Plain key, value pair
+		if (is_scalar($key) && is_scalar($val))
+		{
+			$this->set_array[$key] = $val;
+			$this->values[] = $val;
+		}
+		// Object or array
+		elseif ( ! is_scalar($key))
+		{
+			foreach($key as $k => $v)
+			{
+				$this->set_array[$k] = $v;
+				$this->values[] = $val;
+			}
+		}
+
+		// Use the keys of the array to make the insert/update string
+		// Escape the field names
+		$this->set_array_keys = array_map(array($this->db, 'quote_ident'), array_keys($this->set_array));
+
+		// Generate the "set" string
+		$this->set_string = implode('=?, ', $this->set_array_keys);
+		$this->set_string .= '=?';
+
+		return $this;
+	}
+	
+	// --------------------------------------------------------------------------
 
 	/**
 	 * Creates a join phrase in a compiled query
@@ -967,6 +1033,33 @@ class Query_Builder {
 		return $this->get($table, $limit, $offset);
 	}
 	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Retreive the number of rows in the selected table
+	 *
+	 * @param string $table
+	 * @return int
+	 */
+	public function count_all($table)
+	{
+		//@todo Implement count_all
+	}
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Retrieve the number of results for the generated query - used
+	 * in place of the get() method
+	 *
+	 * @param string $table
+	 * @return int
+	 */
+	public function count_all_results($table='')
+	{
+		// @todo Implement count_all_results
+	}
+	
 	// --------------------------------------------------------------------------
 
 	/**
@@ -1053,44 +1146,6 @@ class Query_Builder {
 	// ! Miscellaneous Methods
 	// --------------------------------------------------------------------------
 
-	/**
-	 * Sets values for inserts / updates / deletes
-	 *
-	 * @param mixed $key
-	 * @param mixed $val
-	 * @return $this
-	 */
-	public function set($key, $val)
-	{
-		// Plain key, value pair
-		if (is_scalar($key) && is_scalar($val))
-		{
-			$this->set_array[$key] = $val;
-			$this->values[] = $val;
-		}
-		// Object or array
-		elseif ( ! is_scalar($key))
-		{
-			foreach($key as $k => $v)
-			{
-				$this->set_array[$k] = $v;
-				$this->values[] = $val;
-			}
-		}
-
-		// Use the keys of the array to make the insert/update string
-		// Escape the field names
-		$this->set_array_keys = array_map(array($this->db, 'quote_ident'), array_keys($this->set_array));
-
-		// Generate the "set" string
-		$this->set_string = implode('=?, ', $this->set_array_keys);
-		$this->set_string .= '=?';
-
-		return $this;
-	}
-
-	// --------------------------------------------------------------------------
-
 	/**
 	 * Calls a function further down the inheritence chain
 	 *
diff --git a/tests/db_files/FB_TEST_DB.FDB b/tests/db_files/FB_TEST_DB.FDB
index faf60be336bc64616eeee1f00633efee0006c91b..e4f6dfcaf6800cd83ef8c98ec1ea371d8d956c8e 100755
GIT binary patch
delta 1360
zcmYjR%}*0i5TAYBw$Mq_2aSRP+uAP(CQ{-jCPrwCBt4)9!oh>0q9%p}19#JK*n=^K
z#KafntTA3RYT!or5A<L-crX>pSE1H}2Vyij@9hrsZFVQW-Ffqy-@KVEmHJDi{t*iX
z^7j*Puq2iOKGHVr0OaTf5Z3%xfYGy`y3e(H4iW@i;|5stOgkTrjlYl0N>^I06s`=o
z(spIgl_6J#UD@Qy<^>tCrRa7RL&?aa@Y6vVU7YKV+-`F7k%c_k@2>v|dcpZQX2oG5
zkcHR5EDVNHFcC_^uV4>+w8`30n6pzbX{Vtxl!gl7OLh+=34acz;S1qC+N;-SAPSEI
z>Q))g2z1noG8VPn&^GEQQNz4?SjW}^lG-KO5CDs=o0E)%!2%ddjqlx=4*ULKz5|3E
zweTHB1liCk7PKv{5((L7+BQ3Cq>f$c-zsJcyjfG}5;FG453nKc@{U6%XUGgzch`t4
zO{8l?MwXN%)zJ#}qCPu+sVfy6!feBf`3epcw1*Do(F=3h8r%8}Y2)vnc7TNM&sq~k
zYet=4$6i5z1Sgfdjwub^tdm-@M)fgY^^FZu&0##+{!@$%Eu7w`iRm<~y}uoew81f}
z!>6ro5G{ejn<Sm=wM{IdcJ`J~^)e2LE<>GEty`EXa44_9!_$np0*uY+LU63Dk($D`
z8S1opzJ<pH0aAP+JZVwV1R~p{n5<EJ#8Yh9YIz$o1rEfeWXvbc*d#J_5#o)+RD-y$
zxmYF51c<m#y{uwfgWqeIQQxYV)8KN2vN+_|`)vi|YIcYEngenIj7`xyVV}?>KseTz
zfWc~IhgvP>sN62qn=JKpMm^ajS^`FNi!VB$k~I>|F$^d56Jzh74>-(0Q+0W^On=SH
zoTLGDYs5)*rAA%VFgsC|`GM_{ckr~T2b7ccr(VdYr84GX?BWR*s&5+;EyL4OCcfV)
l;Ppx?`|@zppTP`kqDE!ZzXyMubN)D=P|I~}fAtfu{s*ak1v>x$

delta 1444
zcmZ8h%}*0S6o0$41^Q?^KthOdrP3CN25pfKJsBG#2{D8N;ow2RZxa#-`~wY#J#f-^
z7^5-XJb2Nl0mFf)@!-t^3Q<&OODSzBMZI{?=$qM@(y*KE>o4=>{eJIbCXt9G60t!8
zPDOiLVDDj=s8UGSk_GUSegLNN;0wTT--q_2&5i>DlipDY4EmO=7l%im2WFVf44auY
ztFoEPW^S8#Y*uZv8k^P5F|Ui6zpQyr&^uc_|FGSArRL74&yITMqUd^d@x9xLt-m8i
zBYeaNgndDH6$rwlKLWe{4!G*`0r*;>IS_(j`v0{q1TX74;GRDOX9?dXe6ubB=L4-W
z)I0RSALN(UvDYkE{Qf!)2)ju(Sd{rWjE3?1FL=C^SFGzTxJM{2lMf{^950a9A~_lI
z9UIrUN@5c<W&+>1HkDQW&JKXA#pjYZXp;4$FfQysid2wYDB&@FGKWny{ZkXu(<gEk
zA1tB8|D`Yz*KthABjQx**uzo>t)(k@CFa-D#G5AmH1U#M$YYov+Q2pmN*Lm|Hn82y
zDB7nRM61I%v}QT1OrO%z>n<g0t&*0?v?kLH8uh#{gPkV9rYr`zoxxTCo@6L>vinm{
zDh-!5NrR5*Xoz)d?6jbVIGj>62o2P@RfPirQ}0&G8nT<Dfgov!3wt3;^kj)X#A}n3
z{5OZ#aB;Rp-PWO;?)6V;th=qTBgH+kQb|qeuav3z7Eu$F=^xlZt9smk9^v54kqEN;
zYw%e~G5PBpNztM8AZhGK5mXfeF>xA}6!xpCEGa3B_vf**MJ($_PP<#Qu=|ZO?0$YX
zj}ephP>I6)d!B}bz+Rm`sRq$(Hu9MQHpDfb9#D;?-h)uqQ!n%o7FUWmNP4|w@#O*y
zDA~4cY7bdDo<TmljYm*8tA{^I;TiLX#k-Oi<y}Rh)}dr6Xec$-L#eSG2nwUmsHCQY
zMmK<6Bx<tDMH<YCgXiPn9c*TLhtub=aXy*Cu<)1VSzO1qfOb)%!H?&#MIB`FD_5>T
Y`{@g!SZ=epU(`KtPTdP_k9TqCKf>8yPXGV_