add tests, wrap query if its complex

Author: nuernbergerA

src/QueryDataTable.php

@@ -210,13 +210,7 @@ protected function filteredCount()
      */
     public function count()
     {
-        $builder = $this->prepareCountQuery();
-
-        $table = $this->connection->raw('('.$builder->toSql().') count_row_table');
-
-        return $this->connection->table($table)
-            ->setBindings($builder->getBindings())
-            ->count();
+        return $this->prepareCountQuery()->count();
     }
 
     /**
@@ -228,12 +222,17 @@ public function prepareCountQuery()
     {
         $builder = clone $this->query;
 
-        if (! $this->isComplexQuery($builder)) {
-            $row_count = $this->wrap('row_count');
-            $builder->select($this->connection->raw("'1' as {$row_count}"));
-            if (! $this->keepSelectBindings) {
-                $builder->setBindings([], 'select');
-            }
+        if ($this->isComplexQuery($builder)) {
+            $table = $this->connection->raw('('.$builder->toSql().') count_row_table');
+
+            return $this->connection->table($table)
+                ->setBindings($builder->getBindings());
+        }
+
+        $row_count = $this->wrap('row_count');
+        $builder->select($this->connection->raw("'1' as {$row_count}"));
+        if (! $this->keepSelectBindings) {
+            $builder->setBindings([], 'select');
         }
 
         return $builder;

tests/Unit/QueryDataTableTest.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Yajra\DataTables\Tests\Unit;
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+use Yajra\DataTables\Tests\Models\User;
+use Yajra\DataTables\Tests\TestCase;
+
+class QueryDataTableTest extends TestCase
+{
+    public function test_complex_query_are_wrapped_and_countable()
+    {
+        /** @var \Yajra\DataTables\QueryDataTable $dataTable */
+        $dataTable = app('datatables')->of(
+            DB::table('module_telers')
+                ->selectRaw('module_telers.id, module_telers.publiceren, module_telers.archief, module_telers.uitgelicht, module_telers.image_header, module_telers.bedrijfsnaam, module_telers.titel, module_telers.plaats, group_concat(DISTINCT productenAlias.titel SEPARATOR \', \') as producten')
+                ->leftJoin('relation_producten_telers', 'module_telers.id', '=', 'relation_producten_telers.telers_id')
+                ->leftJoin('module_producten as productenAlias', 'productenAlias.id', '=', 'relation_producten_telers.producten_id')
+                ->groupBy('module_telers.id')
+        );
+
+        $this->assertQueryWrapped(true, $dataTable->prepareCountQuery());
+
+        /** @var \Yajra\DataTables\QueryDataTable $dataTable */
+        $dataTable = app('datatables')->of(
+            DB::table('posts')->selectRaw('title AS state')->groupBy('state')->having('state', '!=', 'deleted')
+        );
+
+        $this->assertQueryWrapped(true, $dataTable->prepareCountQuery());
+        $this->assertEquals(60, $dataTable->count());
+    }
+
+    public function test_simple_queries_are_not_wrapped_and_countable()
+    {
+        /** @var \Yajra\DataTables\QueryDataTable $dataTable */
+        $dataTable = app('datatables')->of(
+            User::with('posts')->select('users.*')
+        );
+
+        $this->assertQueryWrapped(false, $dataTable->prepareCountQuery());
+        $this->assertEquals(20, $dataTable->count());
+    }
+
+    /**
+     * @param $expected bool
+     * @param $query \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
+     * @return void
+     */
+    protected function assertQueryWrapped($expected, $query)
+    {
+        $sql = $query->toSql();
+
+        $this->assertSame($expected, Str::endsWith($sql, 'count_row_table'), "'{$sql}' is not wrapped");
+    }
+}