synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-15 22:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

generate ids for presets by default

Browse Source
This commit is contained in:
Sas Swart
2025-02-12 10:13:43 +00:00
parent c31ee7b263
commit ce2956d1a7
8 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coderd/database/dbauthz/dbauthz_test.go
View File

@ -886,7 +886,6 @@ func (s *MethodTestSuite) TestOrganization() {
JobID: job.ID, JobID: job.ID,
}) })
insertPresetParams := database.InsertPresetParams{ insertPresetParams := database.InsertPresetParams{
ID: uuid.New(),
TemplateVersionID: workspaceBuild.TemplateVersionID, TemplateVersionID: workspaceBuild.TemplateVersionID,
Name: "test", Name: "test",
} }
@ -3817,7 +3816,6 @@ func (s *MethodTestSuite) TestSystemFunctions() {
CreatedBy: user.ID, CreatedBy: user.ID,
}) })
preset, err := db.InsertPreset(ctx, database.InsertPresetParams{ preset, err := db.InsertPreset(ctx, database.InsertPresetParams{
ID: uuid.New(),
TemplateVersionID: templateVersion.ID, TemplateVersionID: templateVersion.ID,
Name: "test", Name: "test",
}) })

2
coderd/database/dbmem/dbmem.go
View File

@ -8151,7 +8151,7 @@ func (q *FakeQuerier) InsertPreset(_ context.Context, arg database.InsertPresetP
//nolint:gosimple // arg needs to keep its type for interface reasons and that type is not appropriate for preset below. //nolint:gosimple // arg needs to keep its type for interface reasons and that type is not appropriate for preset below.
preset := database.TemplateVersionPreset{ preset := database.TemplateVersionPreset{
ID: arg.ID, ID: uuid.New(),
TemplateVersionID: arg.TemplateVersionID, TemplateVersionID: arg.TemplateVersionID,
Name: arg.Name, Name: arg.Name,
CreatedAt: arg.CreatedAt, CreatedAt: arg.CreatedAt,

2
coderd/database/dump.sql generated
View File

@ -1273,7 +1273,7 @@ CREATE TABLE template_version_preset_parameters (
); );
CREATE TABLE template_version_presets ( CREATE TABLE template_version_presets (
id uuid NOT NULL, id uuid DEFAULT gen_random_uuid() NOT NULL,
template_version_id uuid NOT NULL, template_version_id uuid NOT NULL,
name text NOT NULL, name text NOT NULL,
created_at timestamp with time zone DEFAULT CURRENT_TIMESTAMP NOT NULL created_at timestamp with time zone DEFAULT CURRENT_TIMESTAMP NOT NULL

3
coderd/database/migrations/000292_generate_default_preset_parameter_ids.down.sql
View File

@ -1,2 +1,5 @@
ALTER TABLE template_version_presets
ALTER COLUMN id DROP DEFAULT;
ALTER TABLE template_version_preset_parameters ALTER TABLE template_version_preset_parameters
ALTER COLUMN id DROP DEFAULT; ALTER COLUMN id DROP DEFAULT;

3
coderd/database/migrations/000292_generate_default_preset_parameter_ids.up.sql
View File

@ -1,2 +1,5 @@
ALTER TABLE template_version_presets
ALTER COLUMN id SET DEFAULT gen_random_uuid();
ALTER TABLE template_version_preset_parameters ALTER TABLE template_version_preset_parameters
ALTER COLUMN id SET DEFAULT gen_random_uuid(); ALTER COLUMN id SET DEFAULT gen_random_uuid();

12
coderd/database/queries.sql.go
View File

@ -5494,25 +5494,19 @@ func (q *sqlQuerier) GetPresetsByTemplateVersionID(ctx context.Context, template
const insertPreset = `-- name: InsertPreset :one const insertPreset = `-- name: InsertPreset :one
INSERT INTO INSERT INTO
template_version_presets (id, template_version_id, name, created_at) template_version_presets (template_version_id, name, created_at)
VALUES VALUES
($1, $2, $3, $4) RETURNING id, template_version_id, name, created_at ($1, $2, $3) RETURNING id, template_version_id, name, created_at
` `
type InsertPresetParams struct { type InsertPresetParams struct {
ID uuid.UUID `db:"id" json:"id"`
TemplateVersionID uuid.UUID `db:"template_version_id" json:"template_version_id"` TemplateVersionID uuid.UUID `db:"template_version_id" json:"template_version_id"`
Name string `db:"name" json:"name"` Name string `db:"name" json:"name"`
CreatedAt time.Time `db:"created_at" json:"created_at"` CreatedAt time.Time `db:"created_at" json:"created_at"`
} }
func (q *sqlQuerier) InsertPreset(ctx context.Context, arg InsertPresetParams) (TemplateVersionPreset, error) { func (q *sqlQuerier) InsertPreset(ctx context.Context, arg InsertPresetParams) (TemplateVersionPreset, error) {
row := q.db.QueryRowContext(ctx, insertPreset, row := q.db.QueryRowContext(ctx, insertPreset, arg.TemplateVersionID, arg.Name, arg.CreatedAt)
arg.ID,
arg.TemplateVersionID,
arg.Name,
arg.CreatedAt,
)
var i TemplateVersionPreset var i TemplateVersionPreset
err := row.Scan( err := row.Scan(
&i.ID, &i.ID,

4
coderd/database/queries/presets.sql
View File

@ -1,8 +1,8 @@
-- name: InsertPreset :one -- name: InsertPreset :one
INSERT INTO INSERT INTO
template_version_presets (id, template_version_id, name, created_at) template_version_presets (template_version_id, name, created_at)
VALUES VALUES
(@id, @template_version_id, @name, @created_at) RETURNING *; (@template_version_id, @name, @created_at) RETURNING *;
-- name: InsertPresetParameters :many -- name: InsertPresetParameters :many
INSERT INTO INSERT INTO

1
coderd/presets_test.go
View File

@ -44,7 +44,6 @@ func TestTemplateVersionPresets(t *testing.T) {
provisionerCtx := dbauthz.AsProvisionerd(ctx) provisionerCtx := dbauthz.AsProvisionerd(ctx)
preset, err := db.InsertPreset(provisionerCtx, database.InsertPresetParams{ preset, err := db.InsertPreset(provisionerCtx, database.InsertPresetParams{
ID: sdkPreset.ID,
Name: sdkPreset.Name, Name: sdkPreset.Name,
TemplateVersionID: version.ID, TemplateVersionID: version.ID,
}) })