From 6ecfb40c87c0f1d1f1d5104e1a7a0be274ef3734 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Wed, 31 Oct 2012 20:21:15 +0000
Subject: [PATCH] More cleanup/ refactoring

---
 autoload.php                  |  51 +------------
 classes/db_sql.php            |  66 -----------------
 classes/query_builder.php     | 131 ++++++++++++++--------------------
 common.php                    |  92 ++++++++++++++++++++++++
 tests/db_files/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes
 5 files changed, 147 insertions(+), 193 deletions(-)
 create mode 100644 common.php

diff --git a/autoload.php b/autoload.php
index d8ef8e2..28d0d0b 100644
--- a/autoload.php
+++ b/autoload.php
@@ -27,34 +27,8 @@ define('QBASE_PATH', dirname(__FILE__).'/');
  */
 define('QDRIVER_PATH', QBASE_PATH.'drivers/');
 
-if ( ! function_exists('do_include'))
-{
-	/**
-	 * Bulk directory loading workaround for use
-	 * with array_map and glob
-	 *
-	 * @param string $path
-	 * @return void
-	 */
-	function do_include($path)
-	{
-		require_once($path);
-	}
-}
-
-if ( ! function_exists('mb_trim'))
-{
-	/**
-	 * Multibyte-safe trim function
-	 *
-	 * @param string
-	 * @return string
-	 */
-	function mb_trim($string)
-	{
-		return preg_replace("/(^\s+)|(\s+$)/us", "", $string);
-	}
-}
+// Require some common functions
+require(QBASE_PATH.'common.php');
 
 /**
  * Load a Query class
@@ -92,25 +66,4 @@ function query_autoload($class)
 // Set up autoloader
 spl_autoload_register('query_autoload');
 
-// --------------------------------------------------------------------------
-
-/**
- * Filter out db rows into one array
- *
- * @param array $array
- * @param mixed $index
- * @return array
- */
-function db_filter($array, $index)
-{
-	$new_array = array();
-
-	foreach($array as $a)
-	{
-		$new_array[] = $a[$index];
-	}
-
-	return $new_array;
-}
-
 // End of autoload.php
\ No newline at end of file
diff --git a/classes/db_sql.php b/classes/db_sql.php
index 016b530..b41e046 100644
--- a/classes/db_sql.php
+++ b/classes/db_sql.php
@@ -21,72 +21,6 @@
  */
 abstract class DB_SQL {
 
-	// --------------------------------------------------------------------------
-	// ! Methods to override
-	// --------------------------------------------------------------------------
-
-	/**
-	 * Get the max keyword sql
-	 *
-	 * @return string
-	 */
-	public function max()
-	{
-		return ' MAX';
-	}
-	
-	// --------------------------------------------------------------------------
-	
-	/**
-	 * Get the min keyword sql
-	 *
-	 * @return string
-	 */
-	public function min()
-	{
-		return ' MIN';
-	}
-	
-	// --------------------------------------------------------------------------
-	
-	/**
-	 * Get the 'distinct' keyword 
-	 *
-	 * @return string
-	 */
-	public function distinct()
-	{
-		return ' DISTINCT ';
-	}
-	
-	// --------------------------------------------------------------------------
-	
-	/**
-	 * Get the 'average' keyword
-	 *
-	 * @return string
-	 */
-	public function avg()
-	{
-		return ' AVG';
-	}
-	
-	// --------------------------------------------------------------------------
-	
-	/**
-	 * Get the 'sum' keyword
-	 *
-	 * @return string
-	 */
-	public function sum()
-	{
-		return ' SUM';
-	}
-	
-	// --------------------------------------------------------------------------
-	// ! Abstract Methods
-	// --------------------------------------------------------------------------
-
 	/**
 	 * Get database specific sql for limit clause
 	 *
diff --git a/classes/query_builder.php b/classes/query_builder.php
index f494a87..6e060e1 100644
--- a/classes/query_builder.php
+++ b/classes/query_builder.php
@@ -13,26 +13,6 @@
 
 // --------------------------------------------------------------------------
 
-/**
- * Generic exception for bad drivers
- *
- * @package Query
- * @subpackage Query
- */
-class BadDBDriverException extends InvalidArgumentException {}
-
-// --------------------------------------------------------------------------
-
-/**
- * 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
@@ -130,33 +110,59 @@ class Query_Builder {
 		// Convert array to object
 		if (is_array($params))
 		{
-			$p = new stdClass();
+			$params = new ArrayObject($params, ArrayObject::STD_PROP_LIST | ArrayObject::ARRAY_AS_PROPS);
+		}
+		
+		$params->type = strtolower($params->type);
+		$dbtype = ($params->type !== 'postgresql') ? $params->type : 'pgsql';
 
-			foreach($params as $k => $v)
-			{
-				$p->$k = $v;
-			}
+		// Generate dsn
+		$dsn = $this->_connect($dbtype, $params);
 
-			$params = $p;
+		try
+		{
+			// Create the database connection
+			$this->db = ( ! empty($params->user))
+				? new $dbtype($dsn, $params->user, $params->pass)
+				: new $dbtype($dsn);
+		}
+		catch(Exception $e)
+		{
+			throw new BadConnectionException('Connection failed, invalid arguments', 2);
 		}
 
+		// Set the connection name property, if applicable
+		if (isset($params->name))
+		{
+			$this->conn_name = $params->name;
+		}
+
+		// Instantiate the Query Parser
+		$this->parser = new Query_Parser();
+
+		// Make things just slightly shorter
+		$this->sql =& $this->db->sql;
+	}
+	
+	/**
+	 * Create the dsn for connection to the database
+	 *
+	 * @param string $dbtype
+	 * @param object $params
+	 * @return string
+	 */
+	private function _connect($dbtype, &$params)
+	{
 		// Let the connection work with 'conn_db' or 'database'
 		if (isset($params->database))
 		{
 			$params->conn_db = $params->database;
 		}
 
-
-		$params->type = strtolower($params->type);
-		$dbtype = ($params->type !== 'postgresql') ? $params->type : 'pgsql';
-
-		$dsn = '';
-
 		// Add the driver type to the dsn
-		if ($dbtype !== 'firebird' && $dbtype !== 'sqlite')
-		{
-			$dsn = strtolower($dbtype).':'.$dsn;
-		}
+		$dsn = ($dbtype !== 'firebird' && $dbtype !== 'sqlite')
+			? strtolower($dbtype).':'
+			: '';
 
 		// Make sure the class exists
 		if ( ! class_exists($dbtype))
@@ -196,31 +202,8 @@ class Query_Builder {
 				$dsn = "{$params->host}:{$params->file}";
 			break;
 		}
-
-
-		try
-		{
-			// Create the database connection
-			$this->db = ( ! empty($params->user))
-				? new $dbtype($dsn, $params->user, $params->pass)
-				: new $dbtype($dsn);
-		}
-		catch(Exception $e)
-		{
-			throw new BadConnectionException('Connection failed, invalid arguments', 2);
-		}
-
-		// Set the connection name property, if applicable
-		if (isset($params->name))
-		{
-			$this->conn_name = $params->name;
-		}
-
-		// Instantiate the Query Parser
-		$this->parser = new Query_Parser();
-
-		// Make things just slightly shorter
-		$this->sql =& $this->db->sql;
+		
+		return $dsn;
 	}
 
 	// --------------------------------------------------------------------------
@@ -303,7 +286,7 @@ class Query_Builder {
 	public function select_max($field, $as=FALSE)
 	{
 		// Create the select string
-		$this->select_string .= $this->sql->max().$this->_select($field, $as);
+		$this->select_string .= ' MAX'.$this->_select($field, $as);
 		return $this;
 	}
 
@@ -319,7 +302,7 @@ class Query_Builder {
 	public function select_min($field, $as=FALSE)
 	{
 		// Create the select string
-		$this->select_string .= $this->sql->min().$this->_select($field, $as);
+		$this->select_string .= ' MIN'.$this->_select($field, $as);
 		return $this;
 	}
 
@@ -335,7 +318,7 @@ class Query_Builder {
 	public function select_avg($field, $as=FALSE)
 	{
 		// Create the select string
-		$this->select_string .= $this->sql->avg().$this->_select($field, $as);
+		$this->select_string .= ' AVG'.$this->_select($field, $as);
 		return $this;
 	}
 
@@ -351,7 +334,7 @@ class Query_Builder {
 	public function select_sum($field, $as=FALSE)
 	{
 		// Create the select string
-		$this->select_string .= $this->sql->sum().$this->_select($field, $as);
+		$this->select_string .= ' SUM'.$this->_select($field, $as);
 		return $this;
 	}
 
@@ -365,7 +348,7 @@ class Query_Builder {
 	public function distinct()
 	{
 		// Prepend the keyword to the select string
-		$this->select_string = $this->sql->distinct() . $this->select_string;
+		$this->select_string = ' DISTINCT '.$this->select_string;
 		return $this;
 	}
 
@@ -807,10 +790,8 @@ class Query_Builder {
 	{
 		$table = implode(' ', array_map(array($this->db, 'quote_ident'), explode(' ', trim($table))));
 
-		$parser = new query_parser();
-
 		// Parse out the join condition
-		$parts = $parser->parse_join($condition);
+		$parts = $this->parser->parse_join($condition);
 		$count = count($parts['identifiers']);
 
 		// Go through and quote the identifiers
@@ -1253,12 +1234,9 @@ class Query_Builder {
 	 */
 	public function reset_query()
 	{
-		// Only unset class variables that
-		// are not callable. Otherwise, we'll
-		// delete class methods!
 		foreach($this as $name => $var)
 		{
-			$skip = array('db','sql','queries','table_prefix');
+			$skip = array('db','sql','queries','table_prefix','parser','conn_name');
 
 			// Skip properties that are needed for every query
 			if (in_array($name, $skip))
@@ -1267,10 +1245,7 @@ class Query_Builder {
 			}
 
 			// Nothing query-generation related is safe!
-			if ( ! is_callable($this->$name))
-			{
-				$this->$name = NULL;
-			}
+			$this->$name = NULL;
 
 			// Set empty arrays
 			$this->values = array();
@@ -1412,7 +1387,7 @@ class Query_Builder {
 		// Set the last query to get rowcounts properly
 		$this->db->last_query = $sql;
 
-		// echo $sql . '<br />';
+		//echo $sql . '<br />';
 
 		return $sql;
 	}
diff --git a/common.php b/common.php
new file mode 100644
index 0000000..f54b3c2
--- /dev/null
+++ b/common.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Query
+ *
+ * Free Query Builder / Database Abstraction Layer
+ *
+ * @package		Query
+ * @author		Timothy J. Warren
+ * @copyright	Copyright (c) 2012
+ * @link 		https://github.com/aviat4ion/Query
+ * @license		http://philsturgeon.co.uk/code/dbad-license
+ */
+
+// --------------------------------------------------------------------------
+
+/**
+ * Global classes/functions that don't really fit anywhere else
+ */
+ 
+/**
+ * Generic exception for bad drivers
+ *
+ * @package Query
+ * @subpackage Query
+ */
+class BadDBDriverException extends InvalidArgumentException {}
+
+// --------------------------------------------------------------------------
+
+/**
+ * Generic exception for bad connection strings
+ *
+ * @package Query
+ * @subpackage Query
+ */
+class BadConnectionException extends UnexpectedValueException {}
+
+// --------------------------------------------------------------------------
+
+if ( ! function_exists('do_include'))
+{
+	/**
+	 * Bulk directory loading workaround for use
+	 * with array_map and glob
+	 *
+	 * @param string $path
+	 * @return void
+	 */
+	function do_include($path)
+	{
+		require_once($path);
+	}
+}
+
+// --------------------------------------------------------------------------
+
+if ( ! function_exists('mb_trim'))
+{
+	/**
+	 * Multibyte-safe trim function
+	 *
+	 * @param string
+	 * @return string
+	 */
+	function mb_trim($string)
+	{
+		return preg_replace("/(^\s+)|(\s+$)/us", "", $string);
+	}
+}
+
+// --------------------------------------------------------------------------
+
+/**
+ * Filter out db rows into one array
+ *
+ * @param array $array
+ * @param mixed $index
+ * @return array
+ */
+function db_filter($array, $index)
+{
+	$new_array = array();
+
+	foreach($array as $a)
+	{
+		$new_array[] = $a[$index];
+	}
+
+	return $new_array;
+}
+
+// End of common.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 99457902c8b56900254cdf5790af3646abb6037e..c3affdf22ab95f0e437b7a199047dd34cce81748 100644
GIT binary patch
delta 2713
zcmZvdPiS0K6voec^IkGDw@II4G6_=?Uox3LEiufbsf`la5G(F9g3MBrk`j@S2Z<2q
zCP8EnT#1Xf=*E>47g7}3t_ocg#D#X@LfklstwxZ<l@#HD=iGb0$z;YCW^R7xo^$W{
z&OP_d-d=rgul}Y(uhc#*)5#O4y_6*x7fVF1@rTHDZv8^^&gCB~Ucop7<nrH&28X{F
zOW#hcd~^1rpcy#Lz-<PpX5cjgzZvv3gZ^faZU&jVLDmc0Yo&XAVfISq^TlA|-nH}D
zTYb%1_HIpiciyWFn8oqkaGt08RHEB%NFTeC^vnzC&>f&VUXgz0agE3CcwBLdH1Aev
zh{vD2N&3XA(t=l_zZ{)C-KGI*QTemCU(boA2R3VycYJeSO}Rwz7yIhm*(gn$(dJ7#
z(bn2{vRI10-&e&HW6x|TvxS4s*@q{weuHN}I8ZN^Oa^wxfGFdV>}x-cLziTsn}4cs
zS|t=+eFX77vA6Rq5l`PlZ27dhu^nCIYR6x-R52d=O;y~bQv6R#g=+}p<C0L`SVCEu
zjFC(AIfx%*i<AaD(8XsgFR+gkE7N8vR+#5R^}1%qwCqNHBVK-@^4?CgpsN=88TO+1
z*WXpeyRikMglc0om17&1=!L2{*5}M(lB_JZx?wBCEVfGydw+eP!oGf4f#MJU;L;Nt
z|K&4q{P>5KD!W%o@q=Ski}Qynw}kAa;11Pi!9ubqSe6%_w`yy`{Qo>33#%QT<qc)t
zJVvb(zx70ocv*4c776_tbXC0Tku~Ne^5ij*>ruRXphjKx(c(Ff_rjyaXFR>15l*^A
z*jtOANl2P;@kqq8QH!58;$PL`$96At?y6gXSC_>)TLEIvi&&lmmxcX?11@&Whh03@
z#Rb}x1$VdxrguiP!)BX@x&oflyt)B@-HV(rSZd*{-`E1Dy5eQGP64J_x3@38Y|ByU
zDF;`uqa0k8`rMq&7V^Q64~Bd&<bw-3o1F+eV#+}TgOR`9c7S}$Lp~Vt!H^Gze6XCf
z!|G?zRPm!@mEWC8_(;%X|I-r>r3f`!1c(MhG#H}65Dhj*z8-;x=zU4^dfNceaDZqq
zM1vt34AEeSo-s%6Pw2~d|EUUhr>!Pv07C;98o)*a5g2U?h6FGqfUSg!TQEQa7#hIP
zaKUOAPpIL<=|k2~wHlB!7&(JY&Orh;IR^wr&S2yWM%lqO<zjmQ<O~PoT((#3T%zCI
zrq4{5ZT4KXDXRwAgYlvOqvBv>4@UN2kLEc)epA4Jii43o7}-zSijV59k&3(H#&mgD
zOrcE}Ephr9oqCrfa*YZmcsM6_4#Bwh`b6Elad~5~bA1Rz2n3$queYFS{o62=%O!}!
zLB@|;YCL}TNc9DnLQ&$!M`}7gJXWJim_mKPsL$#B1HQ@apA!A<%o#ELX*qpPhJTZ0
b3g+~Cod>P6pU{~kYruCCQpuNptL6Uyt!9zM

delta 2309
zcmb7_O^6&t6vtonOwabrn{|t9ObD(z$@C@@$il3<i}*nl@hl$V9)yGyCPZ+_z>c6N
z9VGO@o2NSD5-$=$kR>jg5JFT?@Rqv=vzc8MlsE}^2||PaSJgGs88@2grn`Av@72ez
z{;yuQJKycjzoY1t=EPANUYfgw%#!b|nCN>vM1i{aE77T!?;P7c<Qy~wxL2&9@V*s)
zcX;L6)E7F@D$zlr3yCf!I!tsa(G!V|5?$WZm7)%Qh_9Dwm6PS`XOCAdmcCj!oHQ$&
zO)jo~{&m&$?cd94n%<6PX@9jrzwj(AR%)axN9aPeMjuxu>3+FRKb0HwdbLh1*bli*
zr|`Xm|DTp;Z8s~`BeWPz(rV-us??*D$^nJ+Nqg<1&d(GsWBSjeL|T#A*yVbmy%C#N
zdt6tMIn(2#!Deid9@hd*=6;`RZ*2g{ZFC-z!cFAuqS)uou6aAi+SfCG8rbIM7RSN-
zOJ-|}pPO2Y=zRP99Oly^T8~ZT9@nQWb_XINO$6ICclkgu5SRDi5|B1`w|K_9w#$<N
zeqOo9FS<p$I3;noWRBU>R<xAD^-Q1RhHbR3FdIR<Lg$@^^ucPU{YD$!U+!?-obK_l
z;2J`I=jY8|JG}3`PG>;^0vCYq{Gwl~fKmA4ZHo$Mygg;xiLQ>Ixf(x?W+9ITjX+a7
zFqH}oe+}roxozpdOX$pHix)TRLX^sEBRu#nk8})nGYxc{yPkj#b2cY;xOQSPCDBrL
zS%lD14k1uFgoqG?YQpL1+t~c}0D5|qnhSqGPaZ-cgXV1u5zxG?GiaAbpj{q;_So9c
z_(VNr#NgufbZ46z1;US~)RMSDOZ5UW$+WP>LK}aEdb#5C5{4;3?ae>A_JW_iWQ!ay
zl1VNz#Fp)^&y8+xS)2!Zr}BG;5D`Ul4^jMgloiQ%19_3O?3C@xiUcx{>17Wju#{q2
zeN0P4k{iQ{1cy&fBq|e$MA$>eiG*(t!_3_sKG^Ck_)(Gg7|e~CCEv0npQq{09X+7y
zlF=RKLfh#`(G3idr+;I7`Unwqjk94085cc5tRA0&J6uJN$A|Qgg}}8pbRfuy^`;Z+
zIf(WDVS9M?(8mbgc1cWY-gcXz21UY49W`cLsUu`u*a#UHHbNZi;o0U+!ll)m$RXjS
z6s~d-mTdLR6;H|kYLpJv9GV~dy#EmPBq#hqfk7`xpHG<2dR&qM8<`J#JR?<CO3gu)
mg6_Xdsx4tfTQB`_!{*Wh4xinlEal49wE4Tw`@VU|@BRZx%AJ4!