Add latest changes from gitlab-org/gitlab@master

5 files changed, 54 insertions, 1 deletions

diff --git a/db/migrate/20201204085522_add_project_id_into_vulnerability_remediations.rb b/db/migrate/20201204085522_add_project_id_into_vulnerability_remediations.rb
new file mode 100644
index 00000000000..6a136ab0389
--- /dev/null
+++ b/db/migrate/20201204085522_add_project_id_into_vulnerability_remediations.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddProjectIdIntoVulnerabilityRemediations < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    connection.execute('DELETE FROM vulnerability_remediations')
+
+    add_column :vulnerability_remediations, :project_id, :bigint, null: false # rubocop:disable Rails/NotNullColumn
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :vulnerability_remediations, :project_id
+    end
+  end
+end
diff --git a/db/migrate/20201204090855_add_compound_index_to_vulnerability_remediations_table.rb b/db/migrate/20201204090855_add_compound_index_to_vulnerability_remediations_table.rb
new file mode 100644
index 00000000000..0b4b6e552aa
--- /dev/null
+++ b/db/migrate/20201204090855_add_compound_index_to_vulnerability_remediations_table.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class AddCompoundIndexToVulnerabilityRemediationsTable < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  NEW_INDEX_NAME = 'index_vulnerability_remediations_on_project_id_and_checksum'
+  OLD_INDEX_NAME = 'index_vulnerability_remediations_on_checksum'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :vulnerability_remediations, [:project_id, :checksum], unique: true, name: NEW_INDEX_NAME
+    add_concurrent_foreign_key :vulnerability_remediations, :projects, column: :project_id
+
+    remove_concurrent_index_by_name :vulnerability_remediations, OLD_INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index :vulnerability_remediations, :checksum, unique: true, name: OLD_INDEX_NAME
+
+    remove_concurrent_index_by_name :vulnerability_remediations, NEW_INDEX_NAME
+
+    with_lock_retries do
+      remove_foreign_key_if_exists :vulnerability_remediations, column: :project_id
+    end
+  end
+end
diff --git a/db/schema_migrations/20201204085522 b/db/schema_migrations/20201204085522
new file mode 100644
index 00000000000..21009a5d34a
--- /dev/null
+++ b/db/schema_migrations/20201204085522
@@ -0,0 +1 @@
+a1d8228731066fb6dfe436b4d8d034353421d1f45f3896e963f3c7f15fb09fbc
\ No newline at end of file
diff --git a/db/schema_migrations/20201204090855 b/db/schema_migrations/20201204090855
new file mode 100644
index 00000000000..7e6bb71d977
--- /dev/null
+++ b/db/schema_migrations/20201204090855
@@ -0,0 +1 @@
+01712e32d95578fe701738529abfa0e051ef68ed646f7a9c7f775f8a8d108578
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 301597953ab..c84f5eaec80 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -17584,6 +17584,7 @@ CREATE TABLE vulnerability_remediations (
     summary text NOT NULL,
     file text NOT NULL,
     checksum bytea NOT NULL,
+    project_id bigint NOT NULL,
     CONSTRAINT check_ac0ccabff3 CHECK ((char_length(summary) <= 200)),
     CONSTRAINT check_fe3325e3ba CHECK ((char_length(file) <= 255))
 );
@@ -22669,7 +22670,7 @@ CREATE UNIQUE INDEX index_vulnerability_occurrences_on_uuid ON vulnerability_occ
 
 CREATE INDEX index_vulnerability_occurrences_on_vulnerability_id ON vulnerability_occurrences USING btree (vulnerability_id);
 
-CREATE UNIQUE INDEX index_vulnerability_remediations_on_checksum ON vulnerability_remediations USING btree (checksum);
+CREATE UNIQUE INDEX index_vulnerability_remediations_on_project_id_and_checksum ON vulnerability_remediations USING btree (project_id, checksum);
 
 CREATE UNIQUE INDEX index_vulnerability_scanners_on_project_id_and_external_id ON vulnerability_scanners USING btree (project_id, external_id);
 
@@ -23698,6 +23699,9 @@ ALTER TABLE ONLY ci_stages
 ALTER TABLE ONLY system_note_metadata
     ADD CONSTRAINT fk_fbd87415c9 FOREIGN KEY (description_version_id) REFERENCES description_versions(id) ON DELETE SET NULL;
 
+ALTER TABLE ONLY vulnerability_remediations
+    ADD CONSTRAINT fk_fc61a535a0 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY merge_requests
     ADD CONSTRAINT fk_fd82eae0b9 FOREIGN KEY (head_pipeline_id) REFERENCES ci_pipelines(id) ON DELETE SET NULL;