Add ORDERBY and GROUP capabilities

Existing was ORDER and GROUPBY...
sebeka · Sep 26, 2018 · cb17289 · cb17289
1 parent 3086c84
commit cb17289
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/inc/dbmysqliterator.class.php b/inc/dbmysqliterator.class.php
@@ -167,6 +167,7 @@ function buildQuery ($table, $crit = "", $log = false) {
                      break;
 
                   case 'ORDER' :
+                  case 'ORDERBY' :
                      $orderby = $val;
                      unset($crit[$key]);
                      break;
@@ -186,6 +187,7 @@ function buildQuery ($table, $crit = "", $log = false) {
                      unset($crit[$key]);
                      break;
 
+                  case 'GROUP' :
                   case 'GROUPBY' :
                      $groupby = $val;
                      unset($crit[$key]);

diff --git a/tests/units/DBmysqlIterator.php b/tests/units/DBmysqlIterator.php
@@ -200,24 +200,45 @@ public function testFields() {
 
 
    public function testOrder() {
+      $it = $this->it->execute('foo', ['ORDERBY' => 'bar']);
+      $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` ORDER BY `bar`');
+
       $it = $this->it->execute('foo', ['ORDER' => 'bar']);
       $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` ORDER BY `bar`');
 
+      $it = $this->it->execute('foo', ['ORDERBY' => '`baz`']);
+      $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` ORDER BY `baz`');
+
       $it = $this->it->execute('foo', ['ORDER' => '`baz`']);
       $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` ORDER BY `baz`');
 
+      $it = $this->it->execute('foo', ['ORDERBY' => 'bar ASC']);
+      $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` ORDER BY `bar` ASC');
+
       $it = $this->it->execute('foo', ['ORDER' => 'bar ASC']);
       $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` ORDER BY `bar` ASC');
 
+      $it = $this->it->execute('foo', ['ORDERBY' => 'bar DESC']);
+      $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` ORDER BY `bar` DESC');
+
       $it = $this->it->execute('foo', ['ORDER' => 'bar DESC']);
       $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` ORDER BY `bar` DESC');
 
+      $it = $this->it->execute('foo', ['ORDERBY' => ['`a`', 'b ASC', 'c DESC']]);
+      $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` ORDER BY `a`, `b` ASC, `c` DESC');
+
       $it = $this->it->execute('foo', ['ORDER' => ['`a`', 'b ASC', 'c DESC']]);
       $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` ORDER BY `a`, `b` ASC, `c` DESC');
 
+      $it = $this->it->execute('foo', ['ORDERBY' => 'bar, baz ASC']);
+      $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` ORDER BY `bar`, `baz` ASC');
+
       $it = $this->it->execute('foo', ['ORDER' => 'bar, baz ASC']);
       $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` ORDER BY `bar`, `baz` ASC');
 
+      $it = $this->it->execute('foo', ['ORDERBY' => 'bar DESC, baz ASC']);
+      $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` ORDER BY `bar` DESC, `baz` ASC');
+
       $it = $this->it->execute('foo', ['ORDER' => 'bar DESC, baz ASC']);
       $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` ORDER BY `bar` DESC, `baz` ASC');
    }
@@ -449,11 +470,20 @@ public function testGroupBy() {
       $it = $this->it->execute(['foo'], ['GROUPBY' => ['id']]);
       $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` GROUP BY `id`');
 
+      $it = $this->it->execute(['foo'], ['GROUP' => ['id']]);
+      $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` GROUP BY `id`');
+
       $it = $this->it->execute(['foo'], ['GROUPBY' => 'id']);
       $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` GROUP BY `id`');
 
+      $it = $this->it->execute(['foo'], ['GROUP' => 'id']);
+      $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` GROUP BY `id`');
+
       $it = $this->it->execute(['foo'], ['GROUPBY' => ['id', 'name']]);
       $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` GROUP BY `id`, `name`');
+
+      $it = $this->it->execute(['foo'], ['GROUP' => ['id', 'name']]);
+      $this->string($it->getSql())->isIdenticalTo('SELECT * FROM `foo` GROUP BY `id`, `name`');
    }
 
    public function testNoFieldGroupBy() {
@@ -466,6 +496,17 @@ function () {
          ->withType(E_USER_ERROR)
          ->withMessage('Missing group by field')
          ->exists();
+
+      $this->when(
+         function () {
+            $it = $this->it->execute(['foo'], ['GROUP' => []]);
+            $this->string('SELECT * FROM `foo`', $it->getSql(), 'No group by field');
+         }
+      )->error()
+         ->withType(E_USER_ERROR)
+         ->withMessage('Missing group by field')
+         ->exists();
+
    }
 
    public function testRange() {