Support Select Distinct

packaged · Oct 7, 2014 · 53890d1 · 53890d1
1 parent f43ceea
commit 53890d1
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 2 deletions.
diff --git a/src/Builder/QueryBuilder.php b/src/Builder/QueryBuilder.php
@@ -14,4 +14,14 @@ public static function select()
     $statement->addClause($select);
     return $statement;
   }
+
+  public static function selectDistinct()
+  {
+    $select = new SelectClause();
+    $select->setDistinct(true);
+    $select->addFields(func_get_args());
+    $statement = new QueryStatement();
+    $statement->addClause($select);
+    return $statement;
+  }
 }
diff --git a/src/Clause/SelectClause.php b/src/Clause/SelectClause.php
@@ -8,6 +8,18 @@
 class SelectClause implements IClause
 {
   protected $_expressions = [];
+  protected $_distinct = false;
+
+  public function setDistinct($distinct = true)
+  {
+    $this->_distinct = $distinct;
+    return $this;
+  }
+
+  public function isDistinct()
+  {
+    return (bool)$this->_distinct;
+  }
 
   public function addExpression(ISelectExpression $expression)
   {
@@ -47,12 +59,13 @@ public function hasExpressions()
    */
   public function assemble()
   {
+    $return = $this->getAction() . ($this->isDistinct() ? ' DISTINCT' : '');
     if(!$this->hasExpressions())
     {
-      return $this->getAction() . ' *';
+      return $return . ' *';
     }
 
-    return $this->getAction() . ' '
+    return $return . ' '
     . implode(', ', mpull($this->getExpressions(), 'assemble'));
   }
 

diff --git a/tests/Builder/Expect/QueryBuilderSelectTest.php b/tests/Builder/Expect/QueryBuilderSelectTest.php
@@ -15,6 +15,16 @@ public function testSelect()
     );
   }
 
+  public function testSelectDistinct()
+  {
+    $query = QueryBuilder::selectDistinct('field', 'field2');
+
+    $this->assertEquals(
+      'SELECT DISTINCT field, field2',
+      $query->assemble()
+    );
+  }
+
   public function testFrom()
   {
     $query = QueryBuilder::select('field', 'field2');

diff --git a/tests/Clause/SelectClauseTest.php b/tests/Clause/SelectClauseTest.php
@@ -42,6 +42,11 @@ public function testAssemble()
       $clause->assemble()
     );
 
+    $clause->clearExpressions();
+    $clause->addField('first');
+    $clause->setDistinct(true);
+    $this->assertEquals('SELECT DISTINCT first', $clause->assemble());
+
     $this->setExpectedException("InvalidArgumentException");
     $clause->addField(new \stdClass());
   }