laravel/db2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge poorly made :(

Browse Source 
My bad
This commit is contained in:
Lucas Mezêncio 2016-08-30 11:45:10 -03:00
parent 1d08883ef7
commit a973bc6e7e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Query/Grammars/DB2Grammar.php
View File

@ -51,7 +51,7 @@ class DB2Grammar extends Grammar
public function compileSelect(Builder $query) public function compileSelect(Builder $query)
{ {
if (is_null($query->columns)) { if (is_null($query->columns)) {
$query->columns = array('*'); $query->columns = ['*'];
} }
$components = $this->compileComponents($query); $components = $this->compileComponents($query);
@ -92,6 +92,10 @@ class DB2Grammar extends Grammar
$columns = (!empty($components['columns']) ? $components['columns'].', ' : 'select'); $columns = (!empty($components['columns']) ? $components['columns'].', ' : 'select');
if ($columns == 'select *, ' && $query->from) {
$columns = 'select '.$this->tablePrefix.$query->from.'.*, ';
}
$components['columns'] = $this->compileOver($orderings, $columns); $components['columns'] = $this->compileOver($orderings, $columns);
unset($components['orders']); unset($components['orders']);