Commit804f4a1

committed

add pinned status to GetWorkspaces/GetAuthorizedWorkspaces queries

1 parentfaeab68 commit804f4a1Copy full SHA for 804f4a1

File tree

+49

-16

lines changed

+49

-16

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -213,9 +213,9 @@ func (q *sqlQuerier) GetAuthorizedWorkspaces(ctx context.Context, arg GetWorkspa`
`213`	`213`	`// The name comment is for metric tracking`
`214`	`214`	`query:=fmt.Sprintf("-- name: GetAuthorizedWorkspaces :many\n%s",filtered)`
`215`	`215`	`rows,err:=q.db.QueryContext(ctx,query,`
	`216`	`+arg.OwnerID,`
`216`	`217`	`arg.Deleted,`
`217`	`218`	`arg.Status,`
`218`		`-arg.OwnerID,`
`219`	`219`	`arg.OwnerUsername,`
`220`	`220`	`arg.TemplateName,`
`221`	`221`	`pq.Array(arg.TemplateIDs),`
`@@ -253,6 +253,7 @@ func (q *sqlQuerier) GetAuthorizedWorkspaces(ctx context.Context, arg GetWorkspa`
`253`	`253`	`&i.TemplateName,`
`254`	`254`	`&i.TemplateVersionID,`
`255`	`255`	`&i.TemplateVersionName,`
	`256`	`+&i.Pinned,`
`256`	`257`	`&i.Count,`
`257`	`258`	`);err!=nil {`
`258`	`259`	`returnnil,err`

Lines changed: 32 additions & 15 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ SELECT`
`82`	`82`	`COALESCE(template_name.template_name,'unknown')as template_name,`
`83`	`83`	`latest_build.template_version_id,`
`84`	`84`	`latest_build.template_version_name,`
	`85`	`+(upw.user_idIS NOT NULL)::booleanAS pinned,`
`85`	`86`	`COUNT(*) OVER ()as count`
`86`	`87`	`FROM`
`87`	`88`	`workspaces`
`@@ -126,6 +127,19 @@ LEFT JOIN LATERAL (`
`126`	`127`	`WHERE`
`127`	`128`	`templates.id=workspaces.template_id`
`128`	`129`	`) template_nameON true`
	`130`	`+LEFT JOIN LATERAL (`
	`131`	`+SELECT`
	`132`	`+user_id`
	`133`	`+FROM`
	`134`	`+user_pinned_workspaces`
	`135`	`+WHERE`
	`136`	`+workspaces.id=user_pinned_workspaces.workspace_id`
	`137`	`+AND`
	`138`	`+-- Omitting the owner_id parameter will result in`
	`139`	`+-- 00000000-0000-0000-0000-000000000000 which will not match`
	`140`	`+-- any rows in user_pinned_workspaces.`
	`141`	`+user_pinned_workspaces.user_id= @owner_id`
	`142`	`+) upwON TRUE`
`129`	`143`	`WHERE`
`130`	`144`	`-- Optionally include deleted workspaces`
`131`	`145`	`workspaces.deleted= @deleted`
`@@ -262,6 +276,7 @@ WHERE`
`262`	`276`	`-- Authorize Filter clause will be injected below in GetAuthorizedWorkspaces`
`263`	`277`	`-- @authorize_filter`
`264`	`278`	`ORDER BY`
	`279`	`+pinnedDESC,`
`265`	`280`	`(latest_build.completed_atIS NOT NULLAND`
`266`	`281`	`latest_build.canceled_at ISNULLAND`
`267`	`282`	`latest_build.error ISNULLAND`

Comments

(0)