summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2019-07-24 16:45:31 +0200
committerYorick Peterse <yorickpeterse@gmail.com>2019-07-29 13:54:15 +0200
commit998cd8cb70be5093971a41a5be2674ea7bfbd1fb (patch)
tree44a9adf412d4cc2a8d6ff04248fdccb9a2109722
parentca05130319ae9d74ee7771b5a8adb6cf25857fb7 (diff)
downloadgitlab-ce-998cd8cb70be5093971a41a5be2674ea7bfbd1fb.tar.gz
Backport EE changes for the schema specs
This backports two EE specific changes made to the schema changes. We do not yet backport the EE prepend, as this will/can be done when https://gitlab.com/gitlab-org/gitlab-ce/issues/58170 is implemented.
-rw-r--r--spec/db/schema_spec.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index 6cfec5f4017..13fad1b6dc9 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -1,12 +1,14 @@
# frozen_string_literal: true
require 'spec_helper'
+require Rails.root.join('ee', 'spec', 'db', 'schema_support') if Gitlab.ee?
describe 'Database schema' do
let(:connection) { ActiveRecord::Base.connection }
let(:tables) { connection.tables }
# Use if you are certain that this column should not have a foreign key
+ # EE: edit the ee/spec/db/schema_support.rb
IGNORED_FK_COLUMNS = {
abuse_reports: %w[reporter_id user_id],
application_settings: %w[performance_bar_allowed_group_id slack_app_id snowplow_site_id],