Update Datatables.php

Lisa Fehr · Lisa Fehr · commit 75f7cb99b10a · 2015-11-06T15:06:57.000-05:00
"select distinct '1' as row_count" always made count = 1
diff --git a/src/yajra/Datatables/Datatables.php b/src/yajra/Datatables/Datatables.php
@@ -327,9 +327,9 @@ private function count()
     {
         $query = $this->query;
 
-        // if its a normal query ( no union ) replace the select with static text to improve performance
+        // if its a normal query ( no union or distinct ) replace the select with static text to improve performance
         $myQuery = clone $query;
-        if (! preg_match('/UNION/i', strtoupper($myQuery->toSql()))) {
+        if (! preg_match('/(UNION|DISTINCT)/i', strtoupper($myQuery->toSql()))) {
             $myQuery->select($this->connection->raw("'1' as row_count"));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -327,9 +327,9 @@ private function count()`
`327`	`327`	`{`
`328`	`328`	`$query = $this->query;`
`329`	`329`
`330`		`- // if its a normal query ( no union ) replace the select with static text to improve performance`
	`330`	`+ // if its a normal query ( no union or distinct ) replace the select with static text to improve performance`
`331`	`331`	`$myQuery = clone $query;`
`332`		`- if (! preg_match('/UNION/i', strtoupper($myQuery->toSql()))) {`
	`332`	`+ if (! preg_match('/(UNION\|DISTINCT)/i', strtoupper($myQuery->toSql()))) {`
`333`	`333`	`$myQuery->select($this->connection->raw("'1' as row_count"));`
`334`	`334`	`}`
`335`	`335`