Do not append table name if instance is expression.

Fix #927.
yajra · Jan 20, 2017 · 4e0abf4 · 4e0abf4
1 parent 25b0ddc
commit 4e0abf4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Engines/QueryBuilderEngine.php b/src/Engines/QueryBuilderEngine.php
@@ -7,6 +7,7 @@
 use Illuminate\Database\Eloquent\Relations\HasOneOrMany;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Query\Builder;
+use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Str;
 use Yajra\Datatables\Helper;
@@ -405,8 +406,10 @@ protected function addTablePrefix($query, $column)
                 $q = $query;
             }
 
-            // Get table from query and add it.
-            $column = $q->from . '.' . $column;
+            if (! $q->from instanceof Expression) {
+                // Get table from query and add it.
+                $column = $q->from . '.' . $column;
+            }
         }
 
         return $this->wrap($column);