diff --git a/db/post_migrate/20231225133628_remove_due_date_column_from_vulnerabilities.rb b/db/post_migrate/20231225133628_remove_due_date_column_from_vulnerabilities.rb new file mode 100644 index 0000000000000000000000000000000000000000..2f77a5a82f46dd91d548224d7ef5eb0e752d5261 --- /dev/null +++ b/db/post_migrate/20231225133628_remove_due_date_column_from_vulnerabilities.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class RemoveDueDateColumnFromVulnerabilities < Gitlab::Database::Migration[2.2] + milestone '16.8' + + enable_lock_retries! + + def up + remove_column :vulnerabilities, :due_date + end + + def down + add_column :vulnerabilities, :due_date, :date + end +end diff --git a/db/schema_migrations/20231225133628 b/db/schema_migrations/20231225133628 new file mode 100644 index 0000000000000000000000000000000000000000..9206474b25879cbe2671f845fd6a6d6705985e38 --- /dev/null +++ b/db/schema_migrations/20231225133628 @@ -0,0 +1 @@ +6d00c9672b913437f6e4afaef24c32b46d189e34502659dc3f92b1b6b13cff2a \ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 2ce0b1daa76c7920c44dfcc934769dca822d4d35..206abc52ce8f99cbb5d1a6a61bcc1dc5ba4988da 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -24865,7 +24865,6 @@ CREATE TABLE vulnerabilities ( updated_by_id bigint, last_edited_by_id bigint, start_date date, - due_date date, last_edited_at timestamp with time zone, created_at timestamp with time zone NOT NULL, updated_at timestamp with time zone NOT NULL, diff --git a/ee/spec/models/ee/vulnerability_spec.rb b/ee/spec/models/ee/vulnerability_spec.rb index bc1b17d30cebe5de7426c79c4dba1baca76d167e..aef6efd4799901683043671e2e4c475fb0271049 100644 --- a/ee/spec/models/ee/vulnerability_spec.rb +++ b/ee/spec/models/ee/vulnerability_spec.rb @@ -29,7 +29,7 @@ let_it_be(:vulnerability) { create(:vulnerability, :sast, :confirmed, :low, :with_state_transition, project: project) } let_it_be(:finding) { create(:vulnerabilities_finding, vulnerability: vulnerability) } - it { is_expected.to have_locked_schema('669e44a7050fb809ab322ace933868498d6636bd8e11b8bbb959befc53ea082a').reference('https://gitlab.com/gitlab-org/gitlab/-/issues/349315') } + it { is_expected.to have_locked_schema('aeb78a130abaae6d526c87dc265c987b23074746d7fb1912de7e6969e93090d1').reference('https://gitlab.com/gitlab-org/gitlab/-/issues/349315') } it_behaves_like 'vulnerability and finding shared examples' do let(:transformer_method) { :itself }