From 0d0ea981dad7f11eaf65f71ef7ca80fb11e81012 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Wed, 12 Oct 2022 14:53:03 -0500 Subject: [PATCH] fix: Filter by deleted when querying workspaces (#4512) Fixes #4508. --- coderd/database/queries.sql.go | 4 ++-- coderd/database/queries/workspaces.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index 15a5080e30..16613ee7d5 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -5530,7 +5530,7 @@ WHERE -- Filter by owner_name AND CASE WHEN $4 :: text != '' THEN - owner_id = (SELECT id FROM users WHERE lower(username) = lower($4)) + owner_id = (SELECT id FROM users WHERE lower(username) = lower($4) AND deleted = false) ELSE true END -- Filter by template_name @@ -5538,7 +5538,7 @@ WHERE -- Use the organization filter to restrict to 1 org if needed. AND CASE WHEN $5 :: text != '' THEN - template_id = ANY(SELECT id FROM templates WHERE lower(name) = lower($5)) + template_id = ANY(SELECT id FROM templates WHERE lower(name) = lower($5) AND deleted = false) ELSE true END -- Filter by template_ids diff --git a/coderd/database/queries/workspaces.sql b/coderd/database/queries/workspaces.sql index 69a61375c2..2cd6743b68 100644 --- a/coderd/database/queries/workspaces.sql +++ b/coderd/database/queries/workspaces.sql @@ -109,7 +109,7 @@ WHERE -- Filter by owner_name AND CASE WHEN @owner_username :: text != '' THEN - owner_id = (SELECT id FROM users WHERE lower(username) = lower(@owner_username)) + owner_id = (SELECT id FROM users WHERE lower(username) = lower(@owner_username) AND deleted = false) ELSE true END -- Filter by template_name @@ -117,7 +117,7 @@ WHERE -- Use the organization filter to restrict to 1 org if needed. AND CASE WHEN @template_name :: text != '' THEN - template_id = ANY(SELECT id FROM templates WHERE lower(name) = lower(@template_name)) + template_id = ANY(SELECT id FROM templates WHERE lower(name) = lower(@template_name) AND deleted = false) ELSE true END -- Filter by template_ids