From 3a3f46f257bbd0484593e87bf072bb2d132bd837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Eduardo=20Jer=C3=A9z=20Gir=C3=B3n?= Date: Wed, 24 Jul 2024 07:38:13 -0600 Subject: [PATCH] Update PaginateExecutionsParams return type to include related names --- internal/service/executions/paginate_executions.go | 2 +- internal/service/executions/paginate_executions.sql | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/service/executions/paginate_executions.go b/internal/service/executions/paginate_executions.go index 09cc857..161398a 100644 --- a/internal/service/executions/paginate_executions.go +++ b/internal/service/executions/paginate_executions.go @@ -18,7 +18,7 @@ type PaginateExecutionsParams struct { func (s *Service) PaginateExecutions( ctx context.Context, params PaginateExecutionsParams, -) (paginateutil.PaginateResponse, []dbgen.Execution, error) { +) (paginateutil.PaginateResponse, []dbgen.ExecutionsServicePaginateExecutionsRow, error) { page := max(params.Page, 1) limit := min(max(params.Limit, 1), 100) diff --git a/internal/service/executions/paginate_executions.sql b/internal/service/executions/paginate_executions.sql index e647bdd..024ec21 100644 --- a/internal/service/executions/paginate_executions.sql +++ b/internal/service/executions/paginate_executions.sql @@ -24,7 +24,11 @@ AND ); -- name: ExecutionsServicePaginateExecutions :many -SELECT executions.* +SELECT + executions.*, + backups.name AS backup_name, + databases.name AS database_name, + destinations.name AS destination_name FROM executions JOIN backups ON backups.id = executions.backup_id JOIN databases ON databases.id = backups.database_id