improve performance code

yajra · Apr 11, 2024 · cecf821 · cecf821
1 parent 2a3ab60
commit cecf821
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/QueryDataTable.php b/src/QueryDataTable.php
@@ -190,7 +190,7 @@ public function prepareCountQuery(): QueryBuilder
         }
 
         $row_count = $this->wrap('row_count');
-        $builder->select($this->getConnection()->raw("'1' as {$row_count}"));
+        $builder->select($this->getConnection()->raw("'1' as {$row_count}"))->reorder();
         if (! $this->keepSelectBindings) {
             $builder->setBindings([], 'select');
         }
@@ -205,8 +205,9 @@ public function prepareCountQuery(): QueryBuilder
      */
     protected function isComplexQuery($query): bool
     {
-
-        return Str::contains(Str::lower($query->toSql()), ['union', 'having', 'distinct', 'order by', 'group by']);
+        $queryCheck = (clone $query)->select(DB::raw('1 AS dt_row_count'));
+
+        return Str::contains(Str::lower($queryCheck->toSql()), ['union', 'having', 'distinct', 'group by']);
     }
 
     /**