Added 'distinct' method to query builder

aviat4ion · Apr 13, 2012 · 9b9ea5a · 9b9ea5a
1 parent ebe1b1a
commit 9b9ea5a
Show file tree

Hide file tree

Showing 9 changed files with 120 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ Create a connection array or object similar to this:
 The parameters required depend on the database. 
 
 ### Running Queries
-Query uses the same interface as CodeIgniter's [Active Record class](http://codeigniter.com/user_guide/database/active_record.html). However, it does not implement the `count_all_results`, `distinct`, `having`, `or_having`, `insert_batch`, `update_batch`, or `count_all` methods.
+Query uses the same interface as CodeIgniter's [Active Record class](http://codeigniter.com/user_guide/database/active_record.html). However, it does not implement the `count_all_results`, `having`, `or_having`, `insert_batch`, `update_batch`, or `count_all` methods.
 
 #### Retrieving Results
 

diff --git a/classes/db_reg.php b/classes/db_reg.php
@@ -54,6 +54,16 @@ private function __construct($key)
 		// Set the current key in the registry
 		self::$instance[$key] = new Query_Builder($db_params);
 	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Cleanup method
+	 */
+	public function __destruct()
+	{
+		unset(self::$instance);
+	}
 
 	// --------------------------------------------------------------------------
 

diff --git a/classes/db_sql.php b/classes/db_sql.php
@@ -52,7 +52,7 @@ public function min()
 	 */
 	public function distinct()
 	{
-		return ' DISTINCT';
+		return ' DISTINCT ';
 	}
 
 	// --------------------------------------------------------------------------

diff --git a/classes/query_builder.php b/classes/query_builder.php
@@ -19,7 +19,7 @@
 class Query_Builder {
 
 	// Compiled query component strings
-	private $select_string,
+	private $select_string = '',
 		$from_string,
 		$set_string,
 		$order_string,
@@ -171,7 +171,7 @@ public function select($fields)
 			}
 		}
 
-		$this->select_string = implode(', ', $safe_array);
+		$this->select_string .= implode(', ', $safe_array);
 
 		unset($safe_array);
 
@@ -197,7 +197,7 @@ public function select_max($field, $as=FALSE)
 			: $field;
 
 		// Create the select string
-		$this->select_string = $this->sql->max()."({$field}) AS {$as} ";
+		$this->select_string .= $this->sql->max()."({$field}) AS {$as} ";
 
 		return $this;
 	}
@@ -221,7 +221,7 @@ public function select_min($field, $as=FALSE)
 			: $field;
 
 		// Create the select string
-		$this->select_string = $this->sql->min()."({$field}) AS {$as} ";
+		$this->select_string .= $this->sql->min()."({$field}) AS {$as} ";
 
 		return $this;
 	}
@@ -245,7 +245,7 @@ public function select_avg($field, $as=FALSE)
 			: $field;
 
 		// Create the select string
-		$this->select_string = $this->sql->avg()."({$field}) AS {$as} ";
+		$this->select_string .= $this->sql->avg()."({$field}) AS {$as} ";
 
 		return $this;
 	}
@@ -269,11 +269,26 @@ public function select_sum($field, $as=FALSE)
 			: $field;
 
 		// Create the select string
-		$this->select_string = $this->sql->sum()."({$field}) AS {$as} ";
+		$this->select_string .= $this->sql->sum()."({$field}) AS {$as} ";
 
 		return $this;
 	}
 
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Adds the 'distinct' keyword to a query
+	 *
+	 * @return $this
+	 */
+	public function distinct()
+	{
+		// Prepend the keyword to the select string
+		$this->select_string = $this->sql->distinct() . $this->select_string;
+
+		return $this;
+	}
+
 	// --------------------------------------------------------------------------
 
 	/**
@@ -1119,11 +1134,15 @@ private function _reset()
 			// Nothing query-generation related is safe!
 			if ( ! is_callable($this->$name))
 			{
-				unset($this->$name);
+				$this->$name = NULL;
 			}
 
 			// Set values as an empty array
 			$this->values = array();
+
+			// Set select string as an empty string, for proper handling
+			// of the 'distinct' keyword
+			$this->select_string = '';
 		}
 	}
 
@@ -1215,6 +1234,8 @@ private function _compile($type='', $table="")
 
 			break;
 		}
+
+		// echo $sql . '<br />';
 
 		return $sql;
 	}

diff --git a/tests/core/parent.php → tests/core/db_qb_test.php b/tests/core/parent.php → tests/core/db_qb_test.php
@@ -12,46 +12,6 @@
 
 // --------------------------------------------------------------------------
 
-/**
- * Parent Database Test Class
- */
-abstract class DBTest extends UnitTestCase {
-
-	abstract function TestConnection();
-
-	function tearDown()
-	{
-		$this->db = NULL;
-	}
-
-	function TestGetTables()
-	{
-		if (empty($this->db))  return;
-
-		$tables = $this->db->get_tables();
-		$this->assertTrue(is_array($tables));
-	}
-
-	function TestGetSystemTables()
-	{
-		if (empty($this->db))  return;
-
-		$tables = $this->db->get_system_tables();
-
-		$this->assertTrue(is_array($tables));
-	}
-
-	function TestCreateTransaction()
-	{
-		if (empty($this->db))  return;
-
-		$res = $this->db->beginTransaction();
-		$this->assertTrue($res);
-	}
-}
-
-// --------------------------------------------------------------------------
-
 /**
  * Query builder parent test class
  */
@@ -147,6 +107,17 @@ function TestSelectSum()
 		$this->assertIsA($query, 'PDOStatement');
 	}
 
+	function TestSelectDistinct()
+	{
+		if (empty($this->db))  return;
+
+		$query = $this->db->select_sum('id', 'di')
+			->distinct()
+			->get('create_test');
+
+		$this->assertIsA($query, 'PDOStatement');
+	}
+
 	function TestGetWhere()
 	{
 		if (empty($this->db))  return;
@@ -319,4 +290,4 @@ function TestGetViews()
 	}
 }
 
-// End of parent.php
+// End of db_qb_test.php
diff --git a/tests/core/db_test.php b/tests/core/db_test.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Query
+ *
+ * Free Query Builder / Database Abstraction Layer
+ *
+ * @author 		Timothy J. Warren
+ * @copyright	Copyright (c) 2012
+ * @link 		https://github.com/aviat4ion/Query
+ * @license 	http://philsturgeon.co.uk/code/dbad-license 
+ */
+
+// --------------------------------------------------------------------------
+
+/**
+ * Parent Database Test Class
+ */
+abstract class DBTest extends UnitTestCase {
+
+	abstract function TestConnection();
+
+	function tearDown()
+	{
+		$this->db = NULL;
+	}
+
+	function TestGetTables()
+	{
+		if (empty($this->db))  return;
+
+		$tables = $this->db->get_tables();
+		$this->assertTrue(is_array($tables));
+	}
+
+	function TestGetSystemTables()
+	{
+		if (empty($this->db))  return;
+
+		$tables = $this->db->get_system_tables();
+
+		$this->assertTrue(is_array($tables));
+	}
+
+	function TestCreateTransaction()
+	{
+		if (empty($this->db))  return;
+
+		$res = $this->db->beginTransaction();
+		$this->assertTrue($res);
+	}
+}
+// End of db_test.php
diff --git a/tests/databases/firebird/firebird-qb.php b/tests/databases/firebird/firebird-qb.php
@@ -116,6 +116,17 @@ function TestSelectSum()
 		$this->assertIsA($query, 'Firebird_Result');
 	}
 
+	function TestSelectDistinct()
+	{
+		if (empty($this->db))  return;
+
+		$query = $this->db->select_sum('id', 'di')
+			->distinct()
+			->get('create_test');
+
+		$this->assertIsA($query, 'Firebird_Result');
+	}
+
 	function TestGetWhere()
 	{
 		if (empty($this->db))  return;

diff --git a/tests/db_files/FB_TEST_DB.FDB b/tests/db_files/FB_TEST_DB.FDB
diff --git a/tests/index.php b/tests/index.php
@@ -24,10 +24,13 @@
 require_once('simpletest/autorun.php');
 
 // Include db classes
-require_once(BASE_DIR.'autoload.php');
+require_once(BASE_DIR . 'autoload.php');
 
 // Require base testing classes
-array_map('do_include', glob(TEST_DIR . "/core/*.php"));
+require_once(TEST_DIR . '/core/core.php');
+require_once(TEST_DIR . '/core/settings.php');
+require_once(TEST_DIR . '/core/db_test.php');
+require_once(TEST_DIR . '/core/db_qb_test.php');
 
 // Include db tests
 // Load db classes based on capability