diff --git a/app/Http/Controllers/Admin/DatabaseController.php b/app/Http/Controllers/Admin/DatabaseController.php index 6cfa73041..1b7dcb5a2 100644 --- a/app/Http/Controllers/Admin/DatabaseController.php +++ b/app/Http/Controllers/Admin/DatabaseController.php @@ -48,10 +48,7 @@ class DatabaseController extends Controller { return view('admin.databases.index', [ 'databases' => Models\Database::with('server')->paginate(50), - 'hosts' => Models\DatabaseServer::select( - 'database_servers.*', - DB::raw('(SELECT COUNT(*) FROM `databases` WHERE `databases`.`db_server` = database_servers.id) as c_databases') - )->with('node')->paginate(20), + 'hosts' => Models\DatabaseServer::withCount('databases')->with('node')->paginate(20), ]); } diff --git a/resources/views/admin/databases/index.blade.php b/resources/views/admin/databases/index.blade.php index bb7be1e3f..f1c2a4aac 100644 --- a/resources/views/admin/databases/index.blade.php +++ b/resources/views/admin/databases/index.blade.php @@ -92,7 +92,7 @@ {{ $database->name }} {{ $database->host }}:{{ $database->port }} {{ $database->username }} - {{ $database->c_databases }} + {{ $database->databases_count }} @if(is_null($database->node))unlinked@else{{ $database->node->name }}@endif