Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Chumper/Datatable/Engines/QueryEngine.php

Author: dlnsk

src/Chumper/Datatable/Engines/BaseEngine.php

@@ -230,13 +230,21 @@ public function showColumns($cols)
     }
 
     /**
-     * @return \Illuminate\Http\JsonResponse
+     * Used to handle all the inputs directly from an engine, instead of from Datatables.
+     * @see QueryEngine
      */
-    public function make()
+    protected function prepareEngine()
     {
-        //TODO Handle all inputs
         $this->handleInputs();
         $this->prepareSearchColumns();
+    }
+
+    /**
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function make()
+    {
+        $this->prepareEngine();
 
         $output = array(
             "aaData" => $this->internalMake($this->columns, $this->searchColumns)->toArray(),

src/Chumper/Datatable/Engines/QueryEngine.php

@@ -42,6 +42,7 @@ class QueryEngine extends BaseEngine {
         'noGroupByOnCount'  =>  false,
         'distinctCountGroup'=>  false,
         'emptyAtEnd'      =>  false,
+        'returnQuery'       =>  false,
     );
 
     function __construct($builder)
@@ -96,9 +97,9 @@ public function setSearchOperator($value = "LIKE")
         return $this;
     }
 
-    public function setSearchWithAlias()
+    public function setSearchWithAlias($value = true)
     {
-        $this->options['searchWithAlias'] = true;
+        $this->options['searchWithAlias'] = (bool)$value;
         return $this;
     }
 
@@ -108,9 +109,9 @@ public function setEmptyAtEnd()
         return $this;
     }
 
-    public function setNoGroupByOnCount()
+    public function setNoGroupByOnCount($value = true)
     {
-        $this->options['noGroupByOnCount'] = true;
+        $this->options['noGroupByOnCount'] = (bool)$value;
         return $this;
     }
 
@@ -121,14 +122,40 @@ public function setNoGroupByOnCount()
      *
      * Instead of counting all of the rows, the distinct rows in the group by will be counted instead.
      *
+     * @param bool $value should this option be enabled?
      * @return $this
      */
     public function setDistinctCountGroup($value = true)
     {
-        $this->options['distinctCountGroup'] = $value;
+        $this->options['distinctCountGroup'] = (bool)$value;
         return $this;
     }
 
+    /**
+     * Let internalMake return a QueryBuilder, instead of a collection.
+     *
+     * @param bool $value
+     * @return $this
+     */
+    public function setReturnQuery($value = true)
+    {
+        $this->options['returnQuery'] = $value;
+        return $this;
+    }
+
+    /**
+     * Get a Builder object back from the engine. Don't return a collection.
+     *
+     * @return Query\Builder
+     */
+    public function getQueryBuilder()
+    {
+        $this->prepareEngine();
+        $this->setReturnQuery();
+
+        return $this->internalMake($this->columns, $this->searchColumns);
+    }
+
     //--------PRIVATE FUNCTIONS
 
     protected function internalMake(Collection $columns, array $searchColumns = array())
@@ -165,6 +192,10 @@ protected function internalMake(Collection $columns, array $searchColumns = arra
         }
 
         $builder = $this->doInternalOrder($builder, $columns);
+
+        if ($this->options['returnQuery'])
+            return $this->getQuery($builder);
+
         $collection = $this->compile($builder, $columns);
 
         return $collection;
@@ -174,19 +205,27 @@ protected function internalMake(Collection $columns, array $searchColumns = arra
      * @param $builder
      * @return Collection
      */
-    private function getCollection($builder)
+    private function getQuery($builder)
     {
-        if($this->collection == null)
-        {
-            if($this->skip > 0)
-            {
+        // dd($builder->toSql());
+        if ($this->collection == null) {
+            if ($this->skip > 0) {
                 $builder = $builder->skip($this->skip);
             }
-            if($this->limit > 0)
-            {
+            if ($this->limit > 0) {
                 $builder = $builder->take($this->limit);
             }
-            //dd($this->builder->toSql());
+        }
+
+        return $builder;
+    }
+
+    private function getCollection($builder)
+    {
+        $builder = $this->getQuery($builder);
+
+        if ($this->collection == null)
+        {
             $this->collection = $builder->get();
 
             if(is_array($this->collection))
@@ -207,6 +246,7 @@ private function doInternalSearch($builder, $columns)
 
         return $builder;
     }
+
     private function buildSearchQuery($builder, $columns)
     {
         $like = $this->options['searchOperator'];