Implementing a draft version of DISTINCT ON with a fallback

cakephp · Jan 9, 2013 · 2db5305 · 2db5305
1 parent e5fdbca
commit 2db5305
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/Cake/Model/Datasource/Database/Query.php b/lib/Cake/Model/Datasource/Database/Query.php
@@ -202,9 +202,9 @@ protected function _buildSelectPart($parts) {
 		}
 
 		if (is_array($this->_distinct)) {
-			//Supports DISTINCT ON?
-			if (false) {
-
+			//todo: ask driver if it cannot support distinct on
+			if (true) {
+				$this->group($this->_distinct, true);
 			} else {
 				$distinct = sprintf('DISTINCT ON (%s) ', implode(', ', $this->_distinct));
 			}

diff --git a/lib/Cake/Test/TestCase/Model/Datasource/Database/QueryTest.php b/lib/Cake/Test/TestCase/Model/Datasource/Database/QueryTest.php
@@ -1075,6 +1075,12 @@ public function testSelectDistinct() {
 
 		$result = $query->distinct()->execute();
 		$this->assertCount(2, $result);
+
+		$result = $query->select(['id'])->distinct(false)->execute();
+		$this->assertCount(3, $result);
+
+		$result = $query->select(['id'])->distinct(['author_id'])->execute();
+		$this->assertCount(2, $result);
 	}
 
 }