Skip to content

Commit 8204ec2

Browse files
SasSwartSasSwart
committed
revert broken query changes
1 parent efdfe9f commit 8204ec2

File tree

5 files changed

+35
-16
lines changed

5 files changed

+35
-16
lines changed

‎coderd/database/queries/groupmembers.sql

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
-- name: GetGroupMembers :many
22
SELECT * FROM group_members_expanded
3-
WHERE (@include_system::bool OR NOT user_is_system);
3+
WHERE CASE
4+
WHEN @include_system::bool THEN TRUE
5+
ELSE
6+
user_is_system = false
7+
END;
48

59
-- name: GetGroupMembersByGroupID :many
610
SELECT *
711
FROM group_members_expanded
812
WHERE group_id = @group_id
913
-- Filter by system type
10-
AND (@include_system::bool OR NOT user_is_system);
14+
AND CASE
15+
WHEN @include_system::bool THEN TRUE
16+
ELSE
17+
user_is_system = false
18+
END;
1119

1220
-- name: GetGroupMembersCountByGroupID :one
1321
-- Returns the total count of members in a group. Shows the total
@@ -17,7 +25,11 @@ SELECT COUNT(*)
1725
FROM group_members_expanded
1826
WHERE group_id = @group_id
1927
-- Filter by system type
20-
AND (@include_system::bool OR NOT user_is_system);
28+
AND CASE
29+
WHEN @include_system::bool THEN TRUE
30+
ELSE
31+
user_is_system = false
32+
END;
2133

2234
-- InsertUserGroupsByName adds a user to all provided groups, if they exist.
2335
-- name: InsertUserGroupsByName :exec

‎coderd/database/queries/organizationmembers.sql

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ WHERE
2424
ELSE true
2525
END
2626
-- Filter by system type
27-
AND (@include_system::bool OR NOT is_system);
27+
AND CASE
28+
WHEN @include_system::bool THEN TRUE
29+
ELSE
30+
is_system = false
31+
END;
2832

2933
-- name: InsertOrganizationMember :one
3034
INSERT INTO
@@ -86,7 +90,7 @@ WHERE
8690
ELSE true
8791
END
8892
-- Filter by system type
89-
AND (@include_system::bool OR NOT is_system)
93+
AND CASE WHEN @include_system::bool THEN TRUE ELSE is_system = false END
9094
ORDER BY
9195
-- Deterministic and consistent ordering of all users. This is to ensure consistent pagination.
9296
LOWER(username) ASC OFFSET @offset_opt

‎coderd/database/queries/users.sql

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ FROM
4949
users
5050
WHERE
5151
deleted = false
52-
AND (@include_system::bool OR NOT is_system);
52+
AND CASE WHEN @include_system::bool THEN TRUE ELSE is_system = false END;
5353

5454
-- name: GetActiveUserCount :one
5555
SELECT
@@ -58,7 +58,7 @@ FROM
5858
users
5959
WHERE
6060
status = 'active'::user_status AND deleted = false
61-
AND (@include_system::bool OR NOT is_system);
61+
AND CASE WHEN @include_system::bool THEN TRUE ELSE is_system = false END;
6262

6363
-- name: InsertUser :one
6464
INSERT INTO
@@ -250,7 +250,11 @@ WHERE
250250
created_at >= @created_after
251251
ELSE true
252252
END
253-
AND (@include_system::bool OR NOT is_system)
253+
AND CASE
254+
WHEN @include_system::bool THEN TRUE
255+
ELSE
256+
is_system = false
257+
END
254258
AND CASE
255259
WHEN @github_com_user_id :: bigint != 0 THEN
256260
github_com_user_id = @github_com_user_id
@@ -360,7 +364,7 @@ RETURNING id, email, username, last_seen_at;
360364
-- AllUserIDs returns all UserIDs regardless of user status or deletion.
361365
-- name: AllUserIDs :many
362366
SELECT DISTINCT id FROM USERS
363-
WHERE (@include_system::bool OR NOT is_system);
367+
WHERE CASE WHEN @include_system::bool THEN TRUE ELSE is_system = false END;
364368

365369
-- name: UpdateUserHashedOneTimePasscode :exec
366370
UPDATE

‎enterprise/coderd/prebuilds/membership.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,23 @@ func (s StoreMembershipReconciler) ReconcileAll(ctx context.Context, userID uuid
4444
return xerrors.Errorf("determine prebuild organization membership: %w", err)
4545
}
4646

47-
orgMemberShips := make(map[uuid.UUID]struct{}, 0)
47+
orgMemberships := make(map[uuid.UUID]struct{}, 0)
4848
defaultOrg, err := s.store.GetDefaultOrganization(ctx)
4949
if err != nil {
5050
return xerrors.Errorf("get default organization: %w", err)
5151
}
52-
orgMemberShips[defaultOrg.ID] = struct{}{}
52+
orgMemberships[defaultOrg.ID] = struct{}{}
5353
for _, o := range organizationMemberships {
54-
orgMemberShips[o.ID] = struct{}{}
54+
orgMemberships[o.ID] = struct{}{}
5555
}
5656

5757
var membershipInsertionErrors error
5858
for _, preset := range presets {
59-
_, alreadyOrgMember := orgMemberShips[preset.OrganizationID]
59+
_, alreadyOrgMember := orgMemberships[preset.OrganizationID]
6060
if !alreadyOrgMember {
6161
// Add the organization to our list of memberships regardless of potential failure below
6262
// to avoid a retry that will probably be doomed anyway.
63-
orgMemberShips[preset.OrganizationID] = struct{}{}
63+
orgMemberships[preset.OrganizationID] = struct{}{}
6464

6565
// Insert the missing membership
6666
_, err = s.store.InsertOrganizationMember(ctx, database.InsertOrganizationMemberParams{

‎enterprise/coderd/workspacequota_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,11 +481,10 @@ func TestWorkspaceQuota(t *testing.T) {
481481
coderdtest.AwaitTemplateVersionJobCompleted(t, client, versionZeroCost.ID)
482482
templateZeroCost := coderdtest.CreateTemplate(t, client, user.OrganizationID, versionZeroCost.ID)
483483

484-
// Even with zero cost, should pass
484+
// Workspace with zero cost should pass
485485
workspaceZeroCost := coderdtest.CreateWorkspace(t, client, templateZeroCost.ID)
486486
buildZeroCost := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspaceZeroCost.LatestBuild.ID)
487487

488-
// Verify the build failed due to quota
489488
require.Equal(t, codersdk.WorkspaceStatusRunning, buildZeroCost.Status)
490489
require.Empty(t, buildZeroCost.Job.Error)
491490

0 commit comments

Comments
 (0)