diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php index 15984df04..77190ed97 100644 --- a/modules/backend/widgets/Lists.php +++ b/modules/backend/widgets/Lists.php @@ -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); } /* diff --git a/modules/system/aliases.php b/modules/system/aliases.php index bbe149189..fc52af7d3 100644 --- a/modules/system/aliases.php +++ b/modules/system/aliases.php @@ -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', diff --git a/modules/system/providers.php b/modules/system/providers.php index c90e81d6c..f6e0130f0 100644 --- a/modules/system/providers.php +++ b/modules/system/providers.php @@ -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',