Fix merge poorly made :(

My bad
cooperl22 · Aug 30, 2016 · a973bc6 · a973bc6
1 parent 1d08883
commit a973bc6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Query/Grammars/DB2Grammar.php b/src/Query/Grammars/DB2Grammar.php
@@ -51,7 +51,7 @@ protected function compileLimit(Builder $query, $limit)
     public function compileSelect(Builder $query)
     {
         if (is_null($query->columns)) {
-            $query->columns = array('*');
+            $query->columns = ['*'];
         }
 
         $components = $this->compileComponents($query);
@@ -92,6 +92,10 @@ protected function compileAnsiOffset(Builder $query, $components)
 
         $columns = (!empty($components['columns']) ? $components['columns'].', ' : 'select');
 
+        if ($columns == 'select *, ' && $query->from) {
+            $columns = 'select '.$this->tablePrefix.$query->from.'.*, ';
+        }
+
         $components['columns'] = $this->compileOver($orderings, $columns);
 
         unset($components['orders']);