Merge pull request yajra#632 from standaniels/patch-2

Unset any bindings to select statement

Author: yajra

src/yajra/Datatables/Datatables.php

@@ -332,9 +332,17 @@ private function count()
         if ( ! Str::contains(Str::lower($myQuery->toSql()), ['union', 'having', 'distinct'])) {
             $myQuery->select($this->connection->raw("'1' as row_count"));
         }
+        
+        if ($myQuery instanceof QueryBuilder) {
+            $bindings = $myQuery->getRawBindings();
+        } else {
+            $bindings = $myQuery->getQuery()->getRawBindings();
+        }
+        unset($bindings['select']);
+        $bindings = array_flatten($bindings);
 
         return $this->connection->table($this->connection->raw('(' . $myQuery->toSql() . ') count_row_table'))
-            ->setBindings($myQuery->getBindings())->count();
+            ->setBindings($bindings)->count();
     }
 
     /**

tests/DatatablesBuilder.php

@@ -199,7 +199,7 @@ protected function setupBuilder($showAllRecords = false)
 		$builder->getConnection()->shouldReceive('raw')->andReturn('(select id, name from users) count_row_table');
 		$builder->shouldReceive('select')->once()->andReturn($builder);
 		$builder->getConnection()->shouldReceive('table')->times(2)->andReturn($builder);
-		$builder->shouldReceive('getBindings')->times(2)->andReturn(array());
+		$builder->shouldReceive('getRawBindings')->times(2)->andReturn(array());
 		$builder->shouldReceive('setBindings')->times(2)->with(array())->andReturn($builder);
 		if ( ! $showAllRecords) {
 			$builder->shouldReceive('skip')->once()->andReturn($builder);