groupBy and having changed

Author: technicalguru

README.md

@@ -607,8 +607,8 @@ The Query API allows to define grouping result sets and restricting the returned
 // List the number of books that authors published whose names begin with 'John'
 $bookQuery
 	->setColumns(Projections::property('author'), Projections::rowCount('cnt'))
-	->addGroupBy(Projections::property('author'))
-	->addHaving(Restrictions::like('author', 'John%'))
+	->groupBy(Projections::property('author'))
+	->having(Restrictions::like('author', 'John%'))
 	->list();
 ```
 

src/TgDatabase/Criterion/QueryImpl.php

@@ -100,7 +100,7 @@ public function addColumns(Expression ...$expressions) {
 	/**
 	  * Add group by columns for the query.
 	  */
-	public function addGroupBy(Expression ...$expressions) {
+	public function groupBy(Expression ...$expressions) {
 		foreach ($expressions AS $c) {
 			if ($c != NULL) $this->groupBy[] = $c;
 		}
@@ -111,7 +111,7 @@ public function addGroupBy(Expression ...$expressions) {
 	  * Add a restriction to constrain the group by result.
 	  * @return Query - this query for method chaining.
 	  */
-	public function addHaving(Criterion ...$criterions) {
+	public function having(Criterion ...$criterions) {
 		foreach ($criterions AS $criterion) $this->having[] = $criterion;
 		return $this;
 	}

src/TgDatabase/Query.php

@@ -52,13 +52,13 @@ public function setProjection(Expression ...$expressions);
 	  * Add group by column
 	  * @return Query - this query for method chaining.
 	  */
-	public function addGroupBy(Expression ...$expressions);
+	public function groupBy(Expression ...$expressions);
 
 	/**
 	  * Add a restriction to constrain the group by result.
 	  * @return Query - this query for method chaining.
 	  */
-	public function addHaving(Criterion ...$criterions);
+	public function having(Criterion ...$criterions);
 
 	/**
 	  * Set the index of the first result to be retrieved.

tests/TgDatabase/Criterion/QueryImplTest.php

@@ -163,7 +163,7 @@ public function testGroupBySql(): void {
             $query
 				->addColumns(Projections::property('attr1'), Projections::rowCount('cnt'))
 				->add(Restrictions::eq('attr3', 'value3'))
-				->addGroupBy(Projections::property('attr1'));
+				->groupBy(Projections::property('attr1'));
             $this->assertEquals("SELECT `attr1`, COUNT(*) AS `cnt` FROM `dual` GROUP BY `attr1` WHERE (`attr3` = 'value3')", $query->getSelectSql());
         }
     }
@@ -175,8 +175,8 @@ public function testHavingSql(): void {
             $query
 				->addColumns(Projections::property('attr1'), Projections::rowCount('cnt'))
 				->add(Restrictions::eq('attr3', 'value3'))
-				->addGroupBy(Projections::property('attr1'))
-				->addHaving(Restrictions::eq('attr1', 'value1'));
+				->groupBy(Projections::property('attr1'))
+				->having(Restrictions::eq('attr1', 'value1'));
             $this->assertEquals("SELECT `attr1`, COUNT(*) AS `cnt` FROM `dual` GROUP BY `attr1` HAVING (`attr1` = 'value1') WHERE (`attr3` = 'value3')", $query->getSelectSql());
         }
     }