Merge remote-tracking branch 'cooperl22/master'

This commit is contained in:
Lucas Mezêncio 2016-08-24 09:56:49 -03:00
commit 1d08883ef7
2 changed files with 5 additions and 1 deletions

View File

@ -45,7 +45,7 @@ Add the laravel-db2 Service Provider to your config in ``app/config/app.php``:
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).
#### Option 1: Configure DB2 using ``app/config/database.php`` file
#### Option 1: Configure DB2 using ``app/config/database.php`` file
Simply add this code at the end of your ``app/config/database.php`` file:

View File

@ -50,6 +50,10 @@ class DB2Grammar extends Grammar
*/
public function compileSelect(Builder $query)
{
if (is_null($query->columns)) {
$query->columns = array('*');
}
$components = $this->compileComponents($query);
// If an offset is present on the query, we will need to wrap the query in