Skip to content

Commit 1d08883

Browse files
committed
Merge remote-tracking branch 'cooperl22/master'
2 parents 34446c5 + ed43908 commit 1d08883

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Add the laravel-db2 Service Provider to your config in ``app/config/app.php``:
4545

4646
There are two ways to configure laravel-db2. You can choose the most convenient way for you. You can put your DB2 credentials into ``app/config/database.php`` (option 1) file or use package config file which you can be generated through command line by artisan (option 2).
4747

48-
#### Option 1: Configure DB2 using ``app/config/database.php`` file
48+
#### Option 1: Configure DB2 using ``app/config/database.php`` file
4949

5050
Simply add this code at the end of your ``app/config/database.php`` file:
5151

src/Query/Grammars/DB2Grammar.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ protected function compileLimit(Builder $query, $limit)
5050
*/
5151
public function compileSelect(Builder $query)
5252
{
53+
if (is_null($query->columns)) {
54+
$query->columns = array('*');
55+
}
56+
5357
$components = $this->compileComponents($query);
5458

5559
// If an offset is present on the query, we will need to wrap the query in

0 commit comments

Comments
 (0)