Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index c1f4b8d5e25..91199c55b1d 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -316,6 +316,13 @@ module Gitlab
           end
         end
 
+        # Since we may be migrating in one go from a previous version without
+        # `constrained_table_name` then we may see that this column exists
+        # (as above) but the schema cache is still outdated for the model.
+        unless Gitlab::Database::PostgresForeignKey.column_names.include?('constrained_table_name')
+          Gitlab::Database::PostgresForeignKey.reset_column_information
+        end
+
         fks = Gitlab::Database::PostgresForeignKey.by_constrained_table_name_or_identifier(source)
 
         fks = fks.by_referenced_table_name(target) if target