mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Fixes #124 using DbDongle

Browse Source
This commit is contained in:
Sam Georges 2014-05-20 15:45:20 +10:00
parent 6406190634
commit cca27a77d6
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/backend/widgets/Lists.php
View File

@ -7,6 +7,7 @@ use Lang;
use Input;
use Event;
use Backend;
use DbDongle;
use October\Rain\Router\Helper as RouterHelper;
use Backend\Classes\ListColumn;
use Backend\Classes\WidgetBase;
@ -275,17 +276,7 @@ class Lists extends WidgetBase
$table = $this->model->makeRelation($column->relation)->getTable();
$sqlSelect = $this->parseTableName($column->sqlSelect, $table);
switch (Db::getDefaultConnection()) {
default:
case 'mysql':
$selects[] = Db::raw("group_concat(" . $sqlSelect . " separator ', ') as ". $alias);
break;
case 'sqlite':
$selects[] = Db::raw("group_concat(" . $sqlSelect . ", ', ') as ". $alias);
break;
}
$selects[] = DbDongle::raw("group_concat(" . $sqlSelect . " separator ', ') as ". $alias);
$joins[] = $column->relation;
$tables[$column->relation] = $table;
}
@ -302,7 +293,7 @@ class Lists extends WidgetBase
$alias = Db::getQueryGrammar()->wrap($column->columnName);
$sqlSelect = $this->parseTableName($column->sqlSelect, $tables['base']);
$selects[] = Db::raw($sqlSelect . ' as '. $alias);
$selects[] = DbDongle::raw($sqlSelect . ' as '. $alias);
}
/*

1
modules/system/aliases.php
View File

@ -47,6 +47,7 @@ return [
'Flash' => 'October\Rain\Support\Facades\Flash',
'Http' => 'October\Rain\Support\Facades\Http',
'Str' => 'October\Rain\Support\Facades\Str',
'DbDongle' => 'October\Rain\Support\Facades\DbDongle',
'Backend' => 'Backend\Facades\Backend',
'BackendMenu' => 'Backend\Facades\BackendMenu',
'BackendAuth' => 'Backend\Facades\BackendAuth',

2
modules/system/providers.php
View File

@ -11,7 +11,6 @@ return [
'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider',
'Illuminate\Routing\ControllerServiceProvider',
'Illuminate\Cookie\CookieServiceProvider',
'Illuminate\Database\DatabaseServiceProvider',
'Illuminate\Encryption\EncryptionServiceProvider',
'Illuminate\Hashing\HashServiceProvider',
'Illuminate\Log\LogServiceProvider',
@ -29,6 +28,7 @@ return [
/*
* October Rain providers
*/
'October\Rain\Database\DatabaseServiceProvider',
'October\Rain\Filesystem\FilesystemServiceProvider',
'October\Rain\Config\ConfigServiceProvider',
'October\Rain\Html\HtmlServiceProvider',