Merge pull request #1741 from yajra/revert-1737-patch-count-query

yajra · web-flow · commit 2df6fc1e55aa · 2018-05-15T17:11:17.000+08:00
Revert "[8.0] Classify join statements as a complex query."
diff --git a/src/QueryDataTable.php b/src/QueryDataTable.php
@@ -162,7 +162,7 @@ protected function prepareCountQuery()
      */
     protected function isComplexQuery($builder)
     {
-        return Str::contains(Str::lower($builder->toSql()), ['union', 'having', 'distinct', 'order by', 'group by', 'join']);
+        return Str::contains(Str::lower($builder->toSql()), ['union', 'having', 'distinct', 'order by', 'group by']);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ protected function prepareCountQuery()`
`162`	`162`	`*/`
`163`	`163`	`protected function isComplexQuery($builder)`
`164`	`164`	`{`
`165`		`- return Str::contains(Str::lower($builder->toSql()), ['union', 'having', 'distinct', 'order by', 'group by', 'join']);`
	`165`	`+ return Str::contains(Str::lower($builder->toSql()), ['union', 'having', 'distinct', 'order by', 'group by']);`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`/**`