mirror of
https://github.com/coder/coder.git
synced 2025-07-06 15:41:45 +00:00
generate ids for presets by default
This commit is contained in:
@ -886,7 +886,6 @@ func (s *MethodTestSuite) TestOrganization() {
|
||||
JobID: job.ID,
|
||||
})
|
||||
insertPresetParams := database.InsertPresetParams{
|
||||
ID: uuid.New(),
|
||||
TemplateVersionID: workspaceBuild.TemplateVersionID,
|
||||
Name: "test",
|
||||
}
|
||||
@ -3817,7 +3816,6 @@ func (s *MethodTestSuite) TestSystemFunctions() {
|
||||
CreatedBy: user.ID,
|
||||
})
|
||||
preset, err := db.InsertPreset(ctx, database.InsertPresetParams{
|
||||
ID: uuid.New(),
|
||||
TemplateVersionID: templateVersion.ID,
|
||||
Name: "test",
|
||||
})
|
||||
|
@ -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.
|
||||
preset := database.TemplateVersionPreset{
|
||||
ID: arg.ID,
|
||||
ID: uuid.New(),
|
||||
TemplateVersionID: arg.TemplateVersionID,
|
||||
Name: arg.Name,
|
||||
CreatedAt: arg.CreatedAt,
|
||||
|
2
coderd/database/dump.sql
generated
2
coderd/database/dump.sql
generated
@ -1273,7 +1273,7 @@ CREATE TABLE template_version_preset_parameters (
|
||||
);
|
||||
|
||||
CREATE TABLE template_version_presets (
|
||||
id uuid NOT NULL,
|
||||
id uuid DEFAULT gen_random_uuid() NOT NULL,
|
||||
template_version_id uuid NOT NULL,
|
||||
name text NOT NULL,
|
||||
created_at timestamp with time zone DEFAULT CURRENT_TIMESTAMP NOT NULL
|
||||
|
@ -1,2 +1,5 @@
|
||||
ALTER TABLE template_version_presets
|
||||
ALTER COLUMN id DROP DEFAULT;
|
||||
|
||||
ALTER TABLE template_version_preset_parameters
|
||||
ALTER COLUMN id DROP DEFAULT;
|
||||
|
@ -1,2 +1,5 @@
|
||||
ALTER TABLE template_version_presets
|
||||
ALTER COLUMN id SET DEFAULT gen_random_uuid();
|
||||
|
||||
ALTER TABLE template_version_preset_parameters
|
||||
ALTER COLUMN id SET DEFAULT gen_random_uuid();
|
||||
|
@ -5494,25 +5494,19 @@ func (q *sqlQuerier) GetPresetsByTemplateVersionID(ctx context.Context, template
|
||||
|
||||
const insertPreset = `-- name: InsertPreset :one
|
||||
INSERT INTO
|
||||
template_version_presets (id, template_version_id, name, created_at)
|
||||
template_version_presets (template_version_id, name, created_at)
|
||||
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 {
|
||||
ID uuid.UUID `db:"id" json:"id"`
|
||||
TemplateVersionID uuid.UUID `db:"template_version_id" json:"template_version_id"`
|
||||
Name string `db:"name" json:"name"`
|
||||
CreatedAt time.Time `db:"created_at" json:"created_at"`
|
||||
}
|
||||
|
||||
func (q *sqlQuerier) InsertPreset(ctx context.Context, arg InsertPresetParams) (TemplateVersionPreset, error) {
|
||||
row := q.db.QueryRowContext(ctx, insertPreset,
|
||||
arg.ID,
|
||||
arg.TemplateVersionID,
|
||||
arg.Name,
|
||||
arg.CreatedAt,
|
||||
)
|
||||
row := q.db.QueryRowContext(ctx, insertPreset, arg.TemplateVersionID, arg.Name, arg.CreatedAt)
|
||||
var i TemplateVersionPreset
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
|
@ -1,8 +1,8 @@
|
||||
-- name: InsertPreset :one
|
||||
INSERT INTO
|
||||
template_version_presets (id, template_version_id, name, created_at)
|
||||
template_version_presets (template_version_id, name, created_at)
|
||||
VALUES
|
||||
(@id, @template_version_id, @name, @created_at) RETURNING *;
|
||||
(@template_version_id, @name, @created_at) RETURNING *;
|
||||
|
||||
-- name: InsertPresetParameters :many
|
||||
INSERT INTO
|
||||
|
@ -44,7 +44,6 @@ func TestTemplateVersionPresets(t *testing.T) {
|
||||
provisionerCtx := dbauthz.AsProvisionerd(ctx)
|
||||
|
||||
preset, err := db.InsertPreset(provisionerCtx, database.InsertPresetParams{
|
||||
ID: sdkPreset.ID,
|
||||
Name: sdkPreset.Name,
|
||||
TemplateVersionID: version.ID,
|
||||
})
|
||||
|
Reference in New Issue
Block a user