From e8d82f0127bb1bad5fcbd09765d7cb6f8ba07c78 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Wed, 31 Jan 2024 13:40:17 +0200 Subject: [PATCH 1/2] fix(coderd/database): fix limit in `GetUserWorkspaceBuildParameters` --- .../queries/workspacebuildparameters.sql | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/coderd/database/queries/workspacebuildparameters.sql b/coderd/database/queries/workspacebuildparameters.sql index 76bbbae1f3c1d..5cda9c020641f 100644 --- a/coderd/database/queries/workspacebuildparameters.sql +++ b/coderd/database/queries/workspacebuildparameters.sql @@ -16,25 +16,28 @@ WHERE workspace_build_id = $1; -- name: GetUserWorkspaceBuildParameters :many --- name: GetUserWorkspaceBuildParameters :many -SELECT DISTINCT ON (tvp.name) - tvp.name, - wbp.value -FROM - workspace_build_parameters wbp -JOIN - workspace_builds wb ON wb.id = wbp.workspace_build_id -JOIN - workspaces w ON w.id = wb.workspace_id -JOIN - template_version_parameters tvp ON tvp.template_version_id = wb.template_version_id -WHERE - w.owner_id = $1 - AND wb.transition = 'start' - AND w.template_id = $2 - AND tvp.ephemeral = false - AND tvp.name = wbp.name -ORDER BY - tvp.name, wb.created_at DESC +SELECT name, value +FROM ( + SELECT DISTINCT ON (tvp.name) + tvp.name, + wbp.value, + wb.created_at + FROM + workspace_build_parameters wbp + JOIN + workspace_builds wb ON wb.id = wbp.workspace_build_id + JOIN + workspaces w ON w.id = wb.workspace_id + JOIN + template_version_parameters tvp ON tvp.template_version_id = wb.template_version_id + WHERE + w.owner_id = $1 + AND wb.transition = 'start' + AND w.template_id = $2 + AND tvp.ephemeral = false + AND tvp.name = wbp.name + ORDER BY + tvp.name, wb.created_at DESC +) q1 +ORDER BY created_at DESC, name LIMIT 100; - From b4fe4a6efdc328055cad976a2bb8c72c03597421 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Wed, 31 Jan 2024 11:45:34 +0000 Subject: [PATCH 2/2] make gen --- coderd/database/queries.sql.go | 43 +++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index 9a4fa07ec5e54..744d9512eefaf 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -9940,25 +9940,30 @@ func (q *sqlQuerier) InsertWorkspaceAppStats(ctx context.Context, arg InsertWork } const getUserWorkspaceBuildParameters = `-- name: GetUserWorkspaceBuildParameters :many -SELECT DISTINCT ON (tvp.name) - tvp.name, - wbp.value -FROM - workspace_build_parameters wbp -JOIN - workspace_builds wb ON wb.id = wbp.workspace_build_id -JOIN - workspaces w ON w.id = wb.workspace_id -JOIN - template_version_parameters tvp ON tvp.template_version_id = wb.template_version_id -WHERE - w.owner_id = $1 - AND wb.transition = 'start' - AND w.template_id = $2 - AND tvp.ephemeral = false - AND tvp.name = wbp.name -ORDER BY - tvp.name, wb.created_at DESC +SELECT name, value +FROM ( + SELECT DISTINCT ON (tvp.name) + tvp.name, + wbp.value, + wb.created_at + FROM + workspace_build_parameters wbp + JOIN + workspace_builds wb ON wb.id = wbp.workspace_build_id + JOIN + workspaces w ON w.id = wb.workspace_id + JOIN + template_version_parameters tvp ON tvp.template_version_id = wb.template_version_id + WHERE + w.owner_id = $1 + AND wb.transition = 'start' + AND w.template_id = $2 + AND tvp.ephemeral = false + AND tvp.name = wbp.name + ORDER BY + tvp.name, wb.created_at DESC +) q1 +ORDER BY created_at DESC, name LIMIT 100 `