diff options
Diffstat (limited to 'config/initializers/active_record_schema_versions.rb')
| -rw-r--r-- | config/initializers/active_record_schema_versions.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/initializers/active_record_schema_versions.rb b/config/initializers/active_record_schema_versions.rb index a7c342e8053..68be3f126a0 100644 --- a/config/initializers/active_record_schema_versions.rb +++ b/config/initializers/active_record_schema_versions.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true -# Patch to use COPY in db/structure.sql when populating schema_migrations table +# Patch to write version information as empty files under the db/schema_migrations directory # This is intended to reduce potential for merge conflicts in db/structure.sql -ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(Gitlab::Database::PostgresqlAdapter::SchemaVersionsCopyMixin) +ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(Gitlab::Database::PostgresqlAdapter::DumpSchemaVersionsMixin) +# Patch to load version information from empty files under the db/schema_migrations directory +ActiveRecord::Tasks::PostgreSQLDatabaseTasks.prepend(Gitlab::Database::PostgresqlDatabaseTasks::LoadSchemaVersionsMixin) |