From a973bc6e7e4c1325291f9285695c9a1996991ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Mez=C3=AAncio?= Date: Tue, 30 Aug 2016 11:45:10 -0300 Subject: [PATCH] Fix merge poorly made :( My bad --- src/Query/Grammars/DB2Grammar.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Query/Grammars/DB2Grammar.php b/src/Query/Grammars/DB2Grammar.php index 752c806..85031de 100644 --- a/src/Query/Grammars/DB2Grammar.php +++ b/src/Query/Grammars/DB2Grammar.php @@ -51,7 +51,7 @@ class DB2Grammar extends Grammar public function compileSelect(Builder $query) { if (is_null($query->columns)) { - $query->columns = array('*'); + $query->columns = ['*']; } $components = $this->compileComponents($query); @@ -92,6 +92,10 @@ class DB2Grammar extends Grammar $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']);