Merge branch 'main' into dependabot/bundler/actionpack-7.1.4.1

ilyakatz · Nov 8, 2024 · ba0466e · ba0466e
2 parents ae1e808 + fe649dc
commit ba0466e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -126,7 +126,7 @@ GEM
     regexp_parser (2.9.2)
     reline (0.5.10)
       io-console (~> 0.5)
-    rexml (3.3.8)
+    rexml (3.3.9)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)

diff --git a/README.md b/README.md
@@ -162,7 +162,6 @@ Then, in the Engine's `db/data` folder, you can add data migrations and run them
 Run tests for a specific version of Rails
 
 ```
-
 bundle exec appraisal rails-6.1 rspec
 bundle exec appraisal rails-7.0 rspec
 bundle exec appraisal rails-7.1 rspec

diff --git a/lib/data_migrate/database_tasks.rb b/lib/data_migrate/database_tasks.rb
@@ -179,7 +179,9 @@ def self.migrate_with_data
 
       ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
 
-      schema_mapped_versions = if DataMigrate::RailsHelper.rails_version_equal_to_or_higher_than_7_1
+      # 7.2 removes the param for db_configs_with_versions in https://github.com/rails/rails/commit/9572fcb4a0bd5396436689a6a42613886871cd81
+      # 7.1 stable backported the change in https://github.com/rails/rails/commit/c53ec4b60980036b43528829d4b0b7457f759224
+      schema_mapped_versions = if Gem::Dependency.new("railties", ">= 7.1.4").match?("railties", Gem.loaded_specs["railties"].version, true)
         ActiveRecord::Tasks::DatabaseTasks.db_configs_with_versions
       else
         db_configs = ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env)

diff --git a/lib/data_migrate/rails_helper.rb b/lib/data_migrate/rails_helper.rb
@@ -6,6 +6,7 @@ def rails_version_equal_to_or_higher_than_7_2
 
         @equal_to_or_higher_than_7_2 = Gem::Dependency.new("railties", ">= 7.2.0.alpha").match?("railties", Gem.loaded_specs["railties"].version, true)
       end
+
       def rails_version_equal_to_or_higher_than_7_1
         return @equal_to_or_higher_than_7_1 if defined?(@equal_to_or_higher_than_7_1)
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ def rails_version_equal_to_or_higher_than_7_2 @@
             @equal_to_or_higher_than_7_2 = Gem::Dependency.new("railties", ">= 7.2.0.alpha").match?("railties", Gem.loaded_specs["railties"].version, true)
           end
           def rails_version_equal_to_or_higher_than_7_1
             return @equal_to_or_higher_than_7_1 if defined?(@equal_to_or_higher_than_7_1)
@@ Expand Down @@