Merge pull request #4 from the-tinderbox/103-added_add_prefixed_methods

added addGroupBy method, added count method, added getCountQuery method

src/Integrations/Laravel/Builder.php

@@ -42,6 +42,21 @@ public function get()
         }
     }
 
+    /**
+     * Performs compiled sql for count rows only. May be used for pagination
+     * Works only without async queries.
+     *
+     * @param string $column Column to pass into count() aggregate function
+     *
+     * @return int|mixed
+     */
+    public function count($column = '*')
+    {
+        $result = $this->getCountQuery($column)->get();
+
+        return $result[0]['count'] ?? 0;
+    }
+
     /**
      * Perform query and get first row
      *

src/Query/BaseBuilder.php

@@ -145,6 +145,32 @@ public function select(...$columns)
         return $this;
     }
 
+    public function getCountQuery($column = '*')
+    {
+        $builder = $this->cloneWithout(['columns'])->select(raw('count('.$column.') as `count`'));
+
+        if (empty($builder->groups)) {
+            $builder->orders = [];
+        }
+
+        return $builder;
+    }
+
+    /**
+     * Clone the query without the given properties.
+     *
+     * @param  array  $except
+     * @return static
+     */
+    public function cloneWithout(array $except)
+    {
+        return tap(clone $this, function ($clone) use ($except) {
+            foreach ($except as $property) {
+                $clone->{$property} = null;
+            }
+        });
+    }
+
     /**
      * Add columns to exist select statement.
      *
@@ -1576,6 +1602,26 @@ public function groupBy(...$columns)
         return $this;
     }
 
+    /**
+     * Add group by statement to exist group statements
+     *
+     * @param $columns
+     *
+     * @return static
+     */
+    public function addGroupBy(...$columns)
+    {
+        $columns = isset($columns[0]) && is_array($columns[0]) ? $columns[0] : $columns;
+
+        if (empty($columns)) {
+            $columns[] = '*';
+        }
+
+        $this->groups = array_merge($this->groups, $this->processColumns($columns, false));
+
+        return $this;
+    }
+
     /**
      * Add order by statement.
      *

src/Query/Builder.php

@@ -40,6 +40,21 @@ public function get()
         }
     }
 
+    /**
+     * Performs compiled sql for count rows only. May be used for pagination
+     * Works only without async queries.
+     *
+     * @param string $column Column to pass into count() aggregate function
+     *
+     * @return int|mixed
+     */
+    public function count($column = '*')
+    {
+        $result = $this->getCountQuery($column)->get();
+
+        return $result[0]['count'] ?? 0;
+    }
+
     /**
      * Makes clean instance of builder.
      *

tests/BuilderTest.php

@@ -660,6 +660,15 @@ public function test_where_dict()
         $this->assertEquals("SELECT dictGetString('dictionary', 'attribute', tuple('key', 1)) as `attribute`, dictGetString('dictionary2', 'attribute2', 5) as `attribute2` FROM `table` WHERE `attribute` != 'value' OR `attribute2` = 5", $builder->toSql());
     }
 
+    public function test_count()
+    {
+        $builder = $this->getBuilder()->from('table')->select('column1', 'column2', 'column3')->orderBy('column1')->getCountQuery('*');
+        $this->assertEquals('SELECT count(*) as `count` FROM `table`', $builder->toSql());
+
+        $builder = $this->getBuilder()->from('table')->select('column1', 'column2', 'column3')->groupBy('column2')->orderBy('column1')->getCountQuery('*');
+        $this->assertEquals('SELECT count(*) as `count` FROM `table` GROUP BY `column2` ORDER BY `column1` ASC', $builder->toSql());
+    }
+
     public function test_group_by()
     {
         $builder = $this->getBuilder()->from('table')->groupBy('column');
@@ -672,6 +681,15 @@ public function test_group_by()
         $this->assertEquals('SELECT * FROM `table` GROUP BY `column`, `column2`', $builder->toSql());
     }
 
+    public function test_add_group_by()
+    {
+        $builder = $this->getBuilder()->from('table')->groupBy('column')->addGroupBy('column2', 'column3');
+        $this->assertEquals('SELECT * FROM `table` GROUP BY `column`, `column2`, `column3`', $builder->toSql());
+
+        $builder = $this->getBuilder()->from('table')->addGroupBy(['column', 'column2' => 'a']);
+        $this->assertEquals('SELECT * FROM `table` GROUP BY `column`, `column2`', $builder->toSql());
+    }
+
     public function test_havings()
     {
         $builder = $this->getBuilder()->from('table')->groupBy('column')->having('column', 1);