Commit38436e1

committed

Review comments

Signed-off-by: Danny Kopping <dannykopping@gmail.com>

1 parent6f1d961 commit38436e1Copy full SHA for 38436e1

File tree

-9

lines changed

-9

lines changed

Lines changed: 0 additions & 1 deletion

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import (`
`15`	`15`	`"github.com/stretchr/testify/require"`
`16`	`16`
`17`	`17`	`"cdr.dev/slog/sloggers/slogtest"`
	`18`	`+`
`18`	`19`	`"github.com/coder/coder/v2/coderd/coderdtest"`
`19`	`20`	`"github.com/coder/coder/v2/coderd/database"`
`20`	`21`	`"github.com/coder/coder/v2/coderd/database/db2sdk"`
`@@ -3474,6 +3475,5 @@ func TestOrganizationDeleteTrigger(t *testing.T) {`
`3474`	`3475`
`3475`	`3476`	`funcrequireUsersMatch(t testing.TB,expected []database.User,found []database.GetUsersRow,msgstring) {`
`3476`	`3477`	`t.Helper()`
`3477`		`-foundUsers:=database.ConvertUserRows(found)`
`3478`		`-require.ElementsMatch(t,expected,foundUsers,msg)`
	`3478`	`+require.ElementsMatch(t,expected,database.ConvertUserRows(found),msg)`
`3479`	`3479`	`}`

Lines changed: 1 addition & 3 deletions

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

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ FROM workspace_prebuilds p`
`15`	`15`	`LEFT JOIN template_version_presets tvp_curr`
`16`	`16`	`ONtvp_curr.id=p.current_preset_id-- See https://github.com/coder/internal/issues/398.`
`17`	`17`	`WHERE (b.transition='start'::workspace_transition`
`18`		`--- Jobs that are not in terminal states.`
`19`	`18`	`ANDpj.job_status='succeeded'::provisioner_job_status);`
`20`	`19`
`21`	`20`	`-- name: GetTemplatePresetsWithPrebuilds :many`
`@@ -79,7 +78,6 @@ WHERE lb.rn <= lb.desired_instances -- Fetch the last N builds, where N is the n`
`79`	`78`	`GROUP BYlb.template_version_id,lb.preset_id,lb.job_status;`
`80`	`79`
`81`	`80`	`-- name: ClaimPrebuild :one`
`82`		`--- TODO: rewrite to use named CTE instead?`
`83`	`81`	`UPDATE workspaces w`
`84`	`82`	`SET owner_id= @new_user_id::uuid,`
`85`	`83`	`name= @new_name::text,`
`@@ -95,7 +93,7 @@ WHERE w.id IN (SELECT p.id`
`95`	`93`	`ANDb.template_version_preset_id= @preset_id::uuid`
`96`	`94`	`ANDp.lifecycle_state='ready'::workspace_agent_lifecycle_state`
`97`	`95`	`ORDER BY random()`
`98`		`-LIMIT1 FORUPDATE OF p SKIP LOCKED)`
	`96`	`+LIMIT1 FORUPDATE OF p SKIP LOCKED)-- Ensure that a concurrent request will not select the same prebuild.`
`99`	`97`	`RETURNINGw.id,w.name;`
`100`	`98`
`101`	`99`	`-- name: InsertPresetPrebuild :one`

Comments

(0)