Merge pull request #124 from alpha0010/master

Add support for 'GROUP N BY'

Author: oohnoitz

src/SphinxQL.php

@@ -82,6 +82,13 @@ class SphinxQL
      */
     protected $group_by = array();
 
+    /**
+     * When not null changes 'GROUP BY' to 'GROUP N BY'
+     *
+     * @var null|int
+     */
+    protected $group_n_by = null;
+
     /**
      * ORDER BY array
      *
@@ -561,7 +568,11 @@ public function compileSelect()
         $query .= $this->compileMatch().$this->compileWhere();
 
         if (!empty($this->group_by)) {
-            $query .= 'GROUP BY '.implode(', ', $this->group_by).' ';
+            $query .= 'GROUP ';
+            if ($this->group_n_by !== null) {
+                $query .= $this->group_n_by.' ';
+            }
+            $query .= 'BY '.implode(', ', $this->group_by).' ';
         }
 
         if (!empty($this->within_group_order_by)) {
@@ -999,6 +1010,21 @@ public function groupBy($column)
         return $this;
     }
 
+    /**
+     * GROUP N BY clause (SphinxQL-specific)
+     * Changes 'GROUP BY' into 'GROUP N BY'
+     *
+     * @param int $n Number of items per group
+     *
+     * @return SphinxQL
+     */
+    public function groupNBy($n)
+    {
+        $this->group_n_by = (int) $n;
+
+        return $this;
+    }
+
     /**
      * WITHIN GROUP ORDER BY clause (SphinxQL-specific)
      * Adds to the previously added columns
@@ -1351,6 +1377,7 @@ public function reset()
         $this->where = array();
         $this->match = array();
         $this->group_by = array();
+        $this->group_n_by = null;
         $this->within_group_order_by = array();
         $this->having = array();
         $this->order_by = array();
@@ -1382,6 +1409,7 @@ public function resetMatch()
     public function resetGroupBy()
     {
         $this->group_by = array();
+        $this->group_n_by = null;
 
         return $this;
     }

tests/SphinxQL/SphinxQLTest.php

@@ -711,6 +711,42 @@ public function testWithinGroupOrderBy()
         $this->assertEquals('16', $result[0]['id']);
     }
 
+    public function testGroupNBy()
+    {
+        $query = SphinxQL::create(self::$conn)->select()
+            ->from('rt')
+            ->groupBy('gid');
+        $this->assertEquals(
+            'SELECT * FROM rt GROUP BY gid',
+            $query->compile()->getCompiled()
+        );
+
+        $query->groupNBy(3);
+        $this->assertEquals(
+            'SELECT * FROM rt GROUP 3 BY gid',
+            $query->compile()->getCompiled()
+        );
+
+        $query->resetGroupBy();
+        $this->assertEquals(
+            'SELECT * FROM rt',
+            $query->compile()->getCompiled()
+        );
+
+        $query->groupBy('gid');
+        $this->assertEquals(
+            'SELECT * FROM rt GROUP BY gid',
+            $query->compile()->getCompiled()
+        );
+
+        $query->resetGroupBy()
+            ->groupNBy(3);
+        $this->assertEquals(
+            'SELECT * FROM rt',
+            $query->compile()->getCompiled()
+        );
+    }
+
     public function testOffset()
     {
         $this->refill();