diff --git a/db/post_migrate/20251022124000_remove_id_column_from_vulnerability_reads.rb b/db/post_migrate/20251022124000_remove_id_column_from_vulnerability_reads.rb new file mode 100644 index 0000000000000000000000000000000000000000..2507597232e0799594031a86e9e3a9b93b73c990 --- /dev/null +++ b/db/post_migrate/20251022124000_remove_id_column_from_vulnerability_reads.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class RemoveIdColumnFromVulnerabilityReads < Gitlab::Database::Migration[2.3] + milestone '18.6' + + def up + remove_column :vulnerability_reads, :id, if_exists: true + + execute('ALTER TABLE vulnerability_reads ADD PRIMARY KEY (vulnerability_id);') + end + + def down + # no-op - If we remove it, there's no point putting it back + end +end diff --git a/db/schema_migrations/20251022124000 b/db/schema_migrations/20251022124000 new file mode 100644 index 0000000000000000000000000000000000000000..a5a7163af1caa4c635d6d3f9210e8b89db7d8ecc --- /dev/null +++ b/db/schema_migrations/20251022124000 @@ -0,0 +1 @@ +a70fa532b1f7b8f31d9dc860683ba40bd474d78e04b66948064f9436baf8e241 \ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 64d8af58f2481beba53dfe077aa42827bfa206ed..7b1a0a71b515af1f2a4ebeb658068d15f2b7b71b 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -28593,7 +28593,6 @@ CREATE TABLE vulnerability_partial_scans ( ); CREATE TABLE vulnerability_reads ( - id bigint NOT NULL, vulnerability_id bigint NOT NULL, project_id bigint NOT NULL, scanner_id bigint NOT NULL, @@ -28623,15 +28622,6 @@ CREATE TABLE vulnerability_reads ( CONSTRAINT check_f5ba7c2496 CHECK ((traversal_ids IS NOT NULL)) ); -CREATE SEQUENCE vulnerability_reads_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - -ALTER SEQUENCE vulnerability_reads_id_seq OWNED BY vulnerability_reads.id; - CREATE TABLE vulnerability_remediation_uploads ( id bigint NOT NULL, size bigint NOT NULL, @@ -31807,8 +31797,6 @@ ALTER TABLE ONLY vulnerability_occurrence_identifiers ALTER COLUMN id SET DEFAUL ALTER TABLE ONLY vulnerability_occurrences ALTER COLUMN id SET DEFAULT nextval('vulnerability_occurrences_id_seq'::regclass); -ALTER TABLE ONLY vulnerability_reads ALTER COLUMN id SET DEFAULT nextval('vulnerability_reads_id_seq'::regclass); - ALTER TABLE ONLY vulnerability_remediations ALTER COLUMN id SET DEFAULT nextval('vulnerability_remediations_id_seq'::regclass); ALTER TABLE ONLY vulnerability_scanners ALTER COLUMN id SET DEFAULT nextval('vulnerability_scanners_id_seq'::regclass); @@ -35533,7 +35521,7 @@ ALTER TABLE ONLY vulnerability_partial_scans ADD CONSTRAINT vulnerability_partial_scans_pkey PRIMARY KEY (scan_id); ALTER TABLE ONLY vulnerability_reads - ADD CONSTRAINT vulnerability_reads_pkey PRIMARY KEY (id); + ADD CONSTRAINT vulnerability_reads_pkey PRIMARY KEY (vulnerability_id); ALTER TABLE ONLY vulnerability_remediation_uploads ADD CONSTRAINT vulnerability_remediation_uploads_pkey PRIMARY KEY (id, model_type);