Skip to content

Commit 5ebd76b

Browse files
committed
Merge branch 'main' into licenseflow
2 parents 7408d42 + 66d20ca commit 5ebd76b

11 files changed

+17
-9
lines changed

coderd/database/dump.sql

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DROP INDEX provisioner_job_logs_id_job_id_idx;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CREATE INDEX provisioner_job_logs_id_job_id_idx ON provisioner_job_logs USING btree (job_id, id ASC);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DROP INDEX workspace_agents_resource_id_idx;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CREATE INDEX workspace_agents_resource_id_idx ON workspace_agents USING btree (resource_id);

coderd/database/queries.sql.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/queries/provisionerjoblogs.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ WHERE
88
AND (
99
id > @created_after
1010
OR id < @created_before
11-
) ORDER BY id;
11+
) ORDER BY id ASC;
1212

1313
-- name: InsertProvisionerJobLogs :many
1414
INSERT INTO

coderd/database/queries/provisionerjobs.sql

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ WHERE
2323
AND nested.completed_at IS NULL
2424
AND nested.provisioner = ANY(@types :: provisioner_type [ ])
2525
ORDER BY
26-
nested.created_at FOR
27-
UPDATE
28-
SKIP LOCKED
26+
nested.created_at
27+
FOR UPDATE
28+
SKIP LOCKED
2929
LIMIT
3030
1
3131
) RETURNING *;

site/src/pages/GroupsPage/SettingsGroupPageView.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type FormData = {
2727

2828
const validationSchema = Yup.object({
2929
name: nameValidator("Name"),
30-
quota_allowance: Yup.number().required().positive().integer(),
30+
quota_allowance: Yup.number().required().min(0).integer(),
3131
})
3232

3333
const UpdateGroupForm: React.FC<{

0 commit comments

Comments
 (0)