From 998cd8cb70be5093971a41a5be2674ea7bfbd1fb Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Wed, 24 Jul 2019 16:45:31 +0200 Subject: 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. --- spec/db/schema_spec.rb | 2 ++ 1 file changed, 2 insertions(+) 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], -- cgit v1.2.1