From f69df920a225ec2d326f5228b3f4d0bf9059735f Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Mon, 3 Apr 2023 14:13:49 +0000 Subject: [PATCH] fix: ignore deleted workspaces in global stats Fixes #6568. --- coderd/database/queries.sql.go | 6 +++--- coderd/database/queries/workspaces.sql | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index c15b579c03572..7bedc340ae123 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -7423,7 +7423,7 @@ WITH workspaces_with_jobs AS ( build_number DESC LIMIT 1 - ) latest_build ON TRUE + ) latest_build ON TRUE WHERE deleted = false ), pending_workspaces AS ( SELECT COUNT(*) AS count FROM workspaces_with_jobs WHERE started_at IS NULL @@ -7431,8 +7431,8 @@ WITH workspaces_with_jobs AS ( SELECT COUNT(*) AS count FROM workspaces_with_jobs WHERE started_at IS NOT NULL AND canceled_at IS NULL AND - updated_at - INTERVAL '30 seconds' < NOW() AND - completed_at IS NULL + completed_at IS NULL AND + updated_at - INTERVAL '30 seconds' < NOW() ), running_workspaces AS ( SELECT COUNT(*) AS count FROM workspaces_with_jobs WHERE completed_at IS NOT NULL AND diff --git a/coderd/database/queries/workspaces.sql b/coderd/database/queries/workspaces.sql index 1694e5203b3c8..c242286bc32ac 100644 --- a/coderd/database/queries/workspaces.sql +++ b/coderd/database/queries/workspaces.sql @@ -356,7 +356,7 @@ WITH workspaces_with_jobs AS ( build_number DESC LIMIT 1 - ) latest_build ON TRUE + ) latest_build ON TRUE WHERE deleted = false ), pending_workspaces AS ( SELECT COUNT(*) AS count FROM workspaces_with_jobs WHERE started_at IS NULL @@ -364,8 +364,8 @@ WITH workspaces_with_jobs AS ( SELECT COUNT(*) AS count FROM workspaces_with_jobs WHERE started_at IS NOT NULL AND canceled_at IS NULL AND - updated_at - INTERVAL '30 seconds' < NOW() AND - completed_at IS NULL + completed_at IS NULL AND + updated_at - INTERVAL '30 seconds' < NOW() ), running_workspaces AS ( SELECT COUNT(*) AS count FROM workspaces_with_jobs WHERE completed_at IS NOT NULL AND