ignoreSelectsInCountQuery()

Author: Arkhas

src/QueryDataTable.php

@@ -49,6 +49,13 @@ class QueryDataTable extends DataTableAbstract
      */
     protected bool $keepSelectBindings = false;
 
+     /**
+     * Flag to ignore the selects in count query.
+     *
+     * @var bool
+     */
+    public bool $ignoreSelectInCountQuery = false;
+
     /**
      * @param  QueryBuilder  $builder
      */
@@ -159,7 +166,7 @@ public function prepareCountQuery(): QueryBuilder
         if ($this->isComplexQuery($builder)) {
             $builder->select(DB::raw('1'));
 
-            if (! $this->isComplexQuery($builder)) {
+            if ($this->ignoreSelectInCountQuery || ! $this->isComplexQuery($builder)) {
                 return $this->getConnection()
                     ->query()
                     ->fromRaw('('.$builder->toSql().') count_row_table')
@@ -801,4 +808,11 @@ public function getFilteredQuery(): QueryBuilder
 
         return $this->getQuery();
     }
+
+    public function ignoreSelectsInCountQuery()
+    {
+        $this->ignoreSelectInCountQuery = true;
+
+        return $this;
+    }
 }

tests/Unit/QueryDataTableTest.php

@@ -32,11 +32,58 @@ public function test_complex_query_are_wrapped_and_countable()
         $this->assertEquals(60, $dataTable->count());
     }
 
+    public function test_complex_query_use_select_in_count()
+    {
+        /** @var \Yajra\DataTables\QueryDataTable $dataTable */
+        $dataTable = app('datatables')->of(
+            DB::table('users')
+                ->select('users.*')
+                ->addSelect([
+                    'last_post_id' => DB::table('posts')
+                                        ->whereColumn('posts.user_id', 'users.id')
+                                        ->orderBy('created_at')
+                                        ->select('id')
+                ])
+                ->orderBy(DB::table('posts')->whereColumn('posts.user_id', 'users.id')->orderBy('created_at')->select('created_at')
+            )
+        );
+
+        $this->assertQueryHasNoSelect(false, $dataTable->prepareCountQuery());
+        $this->assertEquals(20, $dataTable->count());
+    }
+
+    public function test_complex_query_can_ignore_select_in_count()
+    {
+        /** @var \Yajra\DataTables\QueryDataTable $dataTable */
+        $dataTable = app('datatables')->of(
+            DB::table('users')
+                ->select('users.*')
+                ->addSelect([
+                    'last_post_id' => DB::table('posts')
+                                        ->whereColumn('posts.user_id', 'users.id')
+                                        ->orderBy('created_at')
+                                        ->select('id')
+                ])
+                ->orderBy(DB::table('posts')->whereColumn('posts.user_id', 'users.id')->orderBy('created_at')->select('created_at')
+            )
+        )->ignoreSelectsInCountQuery();
+
+        $this->assertQueryHasNoSelect(true, $dataTable->prepareCountQuery());
+        $this->assertEquals(20, $dataTable->count());
+    }
+
     public function test_simple_queries_with_complexe_select_are_wrapped_without_selects()
     {
         /** @var \Yajra\DataTables\QueryDataTable $dataTable */
         $dataTable = app('datatables')->of(
-            DB::table('users')->select('users.*')->selectRaw('(select id from posts where posts.user_id = users.id order by created_at desc limit 1) as last_post_id')
+            DB::table('users')
+              ->select('users.*')
+              ->addSelect([
+                  'last_post_id' => DB::table('posts')
+                                      ->whereColumn('posts.user_id', 'users.id')
+                                      ->orderBy('created_at')
+                                      ->select('id')
+              ])
         );
 
         $this->assertQueryWrapped(true, $dataTable->prepareCountQuery());
@@ -55,6 +102,17 @@ public function test_simple_queries_are_not_wrapped_and_countable()
         $this->assertEquals(20, $dataTable->count());
     }
 
+    public function test_complexe_queries_can_be_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