Merge pull request #2 from LinguaLeo/add-aggregation-alias

Add aggregation alias
LinguaLeo · Oct 14, 2014 · 996d354 · 996d354
2 parents 1017240 + 81b23da
commit 996d354
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -11,6 +11,9 @@
     "require": {
         "php": ">=5.4.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "3.7.*"
+    },
     "autoload": {
         "psr-0": {
             "LinguaLeo\\": "src/"

diff --git a/src/LinguaLeo/DataQuery/Criteria.php b/src/LinguaLeo/DataQuery/Criteria.php
@@ -83,9 +83,9 @@ public function read(array $fields)
         return $this;
     }
 
-    public function aggregate($func, $field = null)
+    public function aggregate($func, $field = null, $alias = null)
     {
-        $this->aggregations[] = [$func, $field];
+        $this->aggregations[] = [$func, $field, $alias];
         return $this;
     }
 

diff --git a/tests/LinguaLeo/DataQuery/CriteriaTest.php b/tests/LinguaLeo/DataQuery/CriteriaTest.php
@@ -28,6 +28,7 @@
 
 class CriteriaTest extends \PHPUnit_Framework_TestCase
 {
+    /** @var Criteria */
     protected $criteria;
 
     public function setUp()
@@ -83,7 +84,11 @@ public function testAggregate()
     {
         $this->criteria->aggregate('count');
         $this->criteria->aggregate('sum', 'a');
-        $this->assertSame([['count', null], ['sum', 'a']], $this->criteria->aggregations);
+        $this->criteria->aggregate('sum', 'a', 'sum_alias');
+        $this->assertSame(
+            [['count', null, null], ['sum', 'a', null], ['sum', 'a', 'sum_alias']],
+            $this->criteria->aggregations
+        );
     }
 
     public function testWrite()