add selectDistinct() method and tests

Author: co0lc0der

src/QueryBuilder.php

@@ -598,6 +598,23 @@ public function select($table, $fields = '*', bool $dist = false): QueryBuilder
 		return $this;
 	}
 
+    /**
+     * @param array|string $table
+     * @param array|string $fields
+     * @return QueryBuilder
+     */
+    public function selectDistinct($table, $fields = '*'): QueryBuilder
+    {
+        if (!empty($table) && !empty($fields)) {
+            $this->select($table, $fields, true);
+        } else {
+            $this->setError('Empty $table or $fields in ' . __METHOD__);
+            return $this;
+        }
+
+        return $this;
+    }
+
 	/**
 	 * @param array|string $where
 	 * @param string $addition

tests/SqlSelectTest.php

@@ -21,7 +21,7 @@ protected function setUp(): void
         }
     }
 
-	public function testEmptyTable()
+	public function testSelectEmptyTable()
 	{
 		$result = $this->qb->select('', 'param');
 
@@ -30,7 +30,7 @@ public function testEmptyTable()
         $this->assertSame($result->getErrorMessage(), 'Empty $table or $fields in QueryBuilder::select');
 	}
 
-	public function testEmptyFields()
+	public function testSelectEmptyFields()
 	{
 		$result = $this->qb->select('users', []);
 
@@ -39,7 +39,7 @@ public function testEmptyFields()
         $this->assertSame($result->getErrorMessage(), 'Empty $table or $fields in QueryBuilder::select');
 	}
 
-	public function testEmptyTableAndFields()
+	public function testSelectEmptyTableAndFields()
 	{
 		$result = $this->qb->select('', []);
 
@@ -68,7 +68,7 @@ public function testGetSqlNoValues()
         $this->assertSame([1], $result->getParams());
     }
 
-	public function testSelectAll()
+	public function testSelect()
 	{
         $result = $this->qb->select('users');
 
@@ -77,6 +77,15 @@ public function testSelectAll()
         $this->assertSame([], $result->getParams());
 	}
 
+    public function testSelectAliasAll()
+    {
+        $result = $this->qb->select(['u' => 'users'], 'u.*');
+
+        $this->assertSame(false, $result->hasError());
+        $this->assertSame("SELECT u.* FROM `users` AS `u`", $result->getSql());
+        $this->assertSame([], $result->getParams());
+    }
+
 	public function testSelectWhereEq()
 	{
 		$result = $this->qb->select('users')->where([['id', '=', 10]]);
@@ -257,6 +266,33 @@ public function testSelectCounter()
         $this->assertSame([], $result->getParams());
     }
 
+    public function testSelectDistinctMethodEmptyTable()
+    {
+        $result = $this->qb->selectDistinct('', 'param');
+
+        $this->assertSame($this->qb, $result);
+        $this->assertSame(true, $result->hasError());
+        $this->assertSame($result->getErrorMessage(), 'Empty $table or $fields in QueryBuilder::selectDistinct');
+    }
+
+    public function testSelectDistinctMethodEmptyFields()
+    {
+        $result = $this->qb->selectDistinct('users', []);
+
+        $this->assertSame($this->qb, $result);
+        $this->assertSame(true, $result->hasError());
+        $this->assertSame($result->getErrorMessage(), 'Empty $table or $fields in QueryBuilder::selectDistinct');
+    }
+
+    public function testSelectDistinctMethodEmptyTableAndFields()
+    {
+        $result = $this->qb->selectDistinct('', []);
+
+        $this->assertSame($this->qb, $result);
+        $this->assertSame(true, $result->hasError());
+        $this->assertSame($this->qb->getErrorMessage(), 'Empty $table or $fields in QueryBuilder::selectDistinct');
+    }
+
     public function testSelectDistinctOrderBy()
     {
         $result = $this->qb->select('customers', 'city', true)->orderBy('city');
@@ -266,6 +302,15 @@ public function testSelectDistinctOrderBy()
         $this->assertSame([], $result->getParams());
     }
 
+    public function testSelectDistinctMethodOrderBy()
+    {
+        $result = $this->qb->selectDistinct('customers', 'city')->orderBy('city');
+
+        $this->assertSame(false, $result->hasError());
+        $this->assertSame("SELECT DISTINCT `city` FROM `customers` ORDER BY `city` ASC", $result->getSql());
+        $this->assertSame([], $result->getParams());
+    }
+
     public function testSelectDistinctOrderBy2Col()
     {
         $result = $this->qb->select('customers', ['city', 'country'], true)->orderBy('country desc');
@@ -275,6 +320,15 @@ public function testSelectDistinctOrderBy2Col()
         $this->assertSame([], $result->getParams());
     }
 
+    public function testSelectDistinctMethodOrderBy2Col()
+    {
+        $result = $this->qb->selectDistinct('customers', ['city', 'country'])->orderBy('country desc');
+
+        $this->assertSame(false, $result->hasError());
+        $this->assertSame("SELECT DISTINCT `city`, `country` FROM `customers` ORDER BY `country` DESC", $result->getSql());
+        $this->assertSame([], $result->getParams());
+    }
+
     public function testSelectOrderByTwoParams()
     {
         $result = $this->qb->select(['b' => 'branches'], ['b.id', 'b.name'])
@@ -347,7 +401,7 @@ public function testSelectGroupByHavingCount()
         $this->assertSame(['Nevada', 20], $result->getParams());
     }
 
-    public function testSelectSumm()
+    public function testSelectSum()
     {
         $result = $this->qb->select("1+5 as 'res'");