diff --git a/Appraisals b/Appraisals index 12b662a..89312e6 100644 --- a/Appraisals +++ b/Appraisals @@ -7,5 +7,5 @@ appraise 'rails-6.1' do end appraise 'rails-7.0' do - gem 'rails', '~> 7.0' + gem 'rails', '~> 7.0.0' end diff --git a/Changelog.md b/Changelog.md index 675574b..8dcee22 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,10 @@ # Changelog + +## 9.1.3 + +- Fix #342 for schema load on rails 6.x. (#343) + ## 9.1.2 - Fix #281 to maintain rails 6.0 support. (#342) diff --git a/lib/data_migrate/database_tasks.rb b/lib/data_migrate/database_tasks.rb index 2f69442..16f975d 100644 --- a/lib/data_migrate/database_tasks.rb +++ b/lib/data_migrate/database_tasks.rb @@ -68,28 +68,23 @@ def run_migration(migration, direction) end end - def schema_dump_path(db_config, format = ActiveRecord.schema_format) - return ENV["DATA_SCHEMA"] if ENV["DATA_SCHEMA"] + if Gem::Dependency.new("railties", ">= 7.0").match?("railties", Gem.loaded_specs["railties"].version) + # inspired from https://github.com/rails/rails/commit/059d64b874ef8092cca3bc4a7dad06ebd6eeb8ff + def schema_dump_path(db_config, format = ActiveRecord.schema_format) + return ENV["DATA_SCHEMA"] if ENV["DATA_SCHEMA"] - # We only require a schema.rb file for the primary database - return unless db_config.primary? + # We only require a schema.rb file for the primary database + return unless db_config.primary? - if rails_version_lower_than_6_1? - return super.gsub(/(_)?schema\.rb\z/, '\1data_schema.rb') + File.join(File.dirname(ActiveRecord::Tasks::DatabaseTasks.schema_dump_path(db_config, format)), schema_file_type) end - File.join(File.dirname(ActiveRecord::Tasks::DatabaseTasks.schema_dump_path(db_config, format)), schema_file_type) - end - - # Override this method from `ActiveRecord::Tasks::DatabaseTasks` - # to ensure that the sha saved in ar_internal_metadata table - # is from the original schema.rb file - def schema_sha1(file) - if rails_version_lower_than_6_1? - return super(file.gsub(/data_schema.rb\z/, 'schema.rb')) + # Override this method from `ActiveRecord::Tasks::DatabaseTasks` + # to ensure that the sha saved in ar_internal_metadata table + # is from the original schema.rb file + def schema_sha1(file) + ActiveRecord::Tasks::DatabaseTasks.schema_dump_path(ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env, name: "primary")) end - - ActiveRecord::Tasks::DatabaseTasks.schema_dump_path(ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env, name: "primary")) end end @@ -124,9 +119,5 @@ def self.past_migrations(sort = nil) sort&.downcase == "asc" ? sort_migrations(migrations) : sort_migrations(migrations).reverse end - - def self.rails_version_lower_than_6_1? - Gem::Dependency.new("railties", "< 6.1").match?("railties", Gem.loaded_specs["railties"].version) - end end end diff --git a/lib/data_migrate/version.rb b/lib/data_migrate/version.rb index fc027fd..e28b429 100644 --- a/lib/data_migrate/version.rb +++ b/lib/data_migrate/version.rb @@ -1,3 +1,3 @@ module DataMigrate - VERSION = "9.1.2".freeze + VERSION = "9.1.3".freeze end