Add latest changes from gitlab-org/gitlab@master

3 files changed, 18 insertions, 2 deletions

diff --git a/db/migrate/20211119170805_remove_test_report_requirement_issue_constraint.rb b/db/migrate/20211119170805_remove_test_report_requirement_issue_constraint.rb
new file mode 100644
index 00000000000..9064242ee30
--- /dev/null
+++ b/db/migrate/20211119170805_remove_test_report_requirement_issue_constraint.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class RemoveTestReportRequirementIssueConstraint < Gitlab::Database::Migration[1.0]
+  disable_ddl_transaction!
+
+  TARGET_TABLE = :requirements_management_test_reports
+  CONSTRAINT_NAME = 'requirements_test_reports_requirement_id_xor_issue_id'
+
+  def up
+    remove_check_constraint TARGET_TABLE, CONSTRAINT_NAME
+  end
+
+  def down
+    add_check_constraint(TARGET_TABLE, 'num_nonnulls(requirement_id, issue_id) = 1', CONSTRAINT_NAME)
+  end
+end
diff --git a/db/schema_migrations/20211119170805 b/db/schema_migrations/20211119170805
new file mode 100644
index 00000000000..fffb02d4285
--- /dev/null
+++ b/db/schema_migrations/20211119170805
@@ -0,0 +1 @@
+adb95bc78104382fb1d3af2c2775b4b5bd23394b4260c3a97667b4bd7917e0da
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 1c537790fd7..70a7ddc674d 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -18888,8 +18888,7 @@ CREATE TABLE requirements_management_test_reports (
     author_id bigint,
     state smallint NOT NULL,
     build_id bigint,
-    issue_id bigint,
-    CONSTRAINT requirements_test_reports_requirement_id_xor_issue_id CHECK ((num_nonnulls(requirement_id, issue_id) = 1))
+    issue_id bigint
 );
 
 CREATE SEQUENCE requirements_management_test_reports_id_seq