stop using gen_random_uuid

coder · SasSwart · Feb 11, 2025 · Feb 11, 2025 · Feb 11, 2025 · Feb 11, 2025
commit bc7e7d2dce7e48ac448859c1c53d62c94566ff92
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000291_workspace_parameter_presets.up.sql b/coderd/database/migrations/000291_workspace_parameter_presets.up.sql
@@ -1,22 +1,17 @@
--- TODO (sasswart): add IF NOT EXISTS and other clauses to make the migration more robust
 CREATE TABLE template_version_presets
 (
-	id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+	id UUID PRIMARY KEY NOT NULL,
 	template_version_id UUID NOT NULL,
 	name TEXT NOT NULL,
 	created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	-- TODO (sasswart): Will auditing have any relevance to presets?
 	FOREIGN KEY (template_version_id) REFERENCES template_versions (id) ON DELETE CASCADE
 );
 
 CREATE TABLE template_version_preset_parameters
 (
-	id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+	id UUID PRIMARY KEY NOT NULL,
 	template_version_preset_id UUID NOT NULL,
 	name TEXT NOT NULL,
-	-- TODO (sasswart): would it be beneficial to allow presets to still offer a choice for values?
-	-- This would allow an operator to avoid having to create many similar templates where only one or
-	-- a few values are different.
 	value TEXT NOT NULL,
 	FOREIGN KEY (template_version_preset_id) REFERENCES template_version_presets (id) ON DELETE CASCADE
 );
@@ -28,9 +23,6 @@ ALTER TABLE workspace_builds
 ADD CONSTRAINT workspace_builds_template_version_preset_id_fkey
 FOREIGN KEY (template_version_preset_id)
 REFERENCES template_version_presets (id)
--- TODO (sasswart): SET NULL might not be the best choice here. The rest of the hierarchy has ON DELETE CASCADE.
--- We don't want CASCADE here, because we don't want to delete the workspace build if the preset is deleted.
--- However, do we want to lose record of the preset id for a workspace build?
 ON DELETE SET NULL;
 
 -- Recreate the view to include the new column.

diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/presets.sql b/coderd/database/queries/presets.sql
@@ -1,13 +1,14 @@
 -- name: InsertPreset :one
 INSERT INTO
-	template_version_presets (template_version_id, name, created_at)
+	template_version_presets (id, template_version_id, name, created_at)
 VALUES
-	(@template_version_id, @name, @created_at) RETURNING *;
+	(@id, @template_version_id, @name, @created_at) RETURNING *;
 
 -- name: InsertPresetParameters :many
 INSERT INTO
-	template_version_preset_parameters (template_version_preset_id, name, value)
+	template_version_preset_parameters (id, template_version_preset_id, name, value)
 SELECT
+	@id,
 	@template_version_preset_id,
 	unnest(@names :: TEXT[]),
 	unnest(@values :: TEXT[])