diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-01 09:06:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-01 09:06:11 +0300 |
| commit | 864475536355651a9f7caa5b1606aa5640424ec3 (patch) | |
| tree | 1dc80c96ddf3f9049c4a163b4c49f052a9b1a4ad /lib/gitlab/database | |
| parent | 7ddd5846999029916b2b6d8560b5b0f02ec0f6ea (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/database')
| -rw-r--r-- | lib/gitlab/database/obsolete_ignored_columns.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/gitlab/database/obsolete_ignored_columns.rb b/lib/gitlab/database/obsolete_ignored_columns.rb index 6266b6a4b65..ad5473f1b74 100644 --- a/lib/gitlab/database/obsolete_ignored_columns.rb +++ b/lib/gitlab/database/obsolete_ignored_columns.rb @@ -23,8 +23,15 @@ module Gitlab private def ignored_columns_safe_to_remove_for(klass) - ignored = klass.ignored_columns.map(&:to_s) + ignores = ignored_and_not_present(klass).each_with_object({}) do |col, h| + h[col] = klass.ignored_columns_details[col.to_sym] + end + + ignores.select { |_, i| i&.safe_to_remove? } + end + def ignored_and_not_present(klass) + ignored = klass.ignored_columns.map(&:to_s) return [] if ignored.empty? schema = klass.connection.schema_cache.columns_hash(klass.table_name) |