Add support for Rails 7.1

bquorning · bquorning · commit 6ca792b02c77 · 2023-11-26T19:33:09.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,6 +16,7 @@ jobs:
           - rails6.0
           - rails6.1
           - rails7.0
+          - rails7.1
         include:
           - {ruby-version: '2.6', gemfile: rails4.2}
           - {ruby-version: '2.6', gemfile: rails5.0}
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     migration_tools (1.8.0)
-      activerecord (>= 4.2.0, < 7.1)
+      activerecord (>= 4.2.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails4.2.gemfile.lock b/gemfiles/rails4.2.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.8.0)
-      activerecord (>= 4.2.0, < 7.1)
+      activerecord (>= 4.2.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails5.0.gemfile.lock b/gemfiles/rails5.0.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.8.0)
-      activerecord (>= 4.2.0, < 7.1)
+      activerecord (>= 4.2.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails5.1.gemfile.lock b/gemfiles/rails5.1.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.8.0)
-      activerecord (>= 4.2.0, < 7.1)
+      activerecord (>= 4.2.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails5.2.gemfile.lock b/gemfiles/rails5.2.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.8.0)
-      activerecord (>= 4.2.0, < 7.1)
+      activerecord (>= 4.2.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails6.0.gemfile.lock b/gemfiles/rails6.0.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.8.0)
-      activerecord (>= 4.2.0, < 7.1)
+      activerecord (>= 4.2.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails6.1.gemfile.lock b/gemfiles/rails6.1.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.8.0)
-      activerecord (>= 4.2.0, < 7.1)
+      activerecord (>= 4.2.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails7.0.gemfile.lock b/gemfiles/rails7.0.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.8.0)
-      activerecord (>= 4.2.0, < 7.1)
+      activerecord (>= 4.2.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails7.1.gemfile b/gemfiles/rails7.1.gemfile
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.1.0"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: ".."
diff --git a/gemfiles/rails7.1.gemfile.lock b/gemfiles/rails7.1.gemfile.lock
@@ -0,0 +1,64 @@
+PATH
+  remote: ..
+  specs:
+    migration_tools (1.8.0)
+      activerecord (>= 4.2.0, < 7.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.1.2)
+      activesupport (= 7.1.2)
+    activerecord (7.1.2)
+      activemodel (= 7.1.2)
+      activesupport (= 7.1.2)
+      timeout (>= 0.4.0)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.4)
+    bump (0.10.0)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    drb (2.2.0)
+      ruby2_keywords
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    mini_portile2 (2.8.5)
+    minitest (5.20.0)
+    minitest-rg (5.3.0)
+      minitest (~> 5.0)
+    mocha (2.1.0)
+      ruby2_keywords (>= 0.0.5)
+    mutex_m (0.2.0)
+    rake (13.1.0)
+    ruby2_keywords (0.0.5)
+    sqlite3 (1.6.8)
+      mini_portile2 (~> 2.8.0)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 7.1.0)
+  bump
+  migration_tools!
+  minitest
+  minitest-rg
+  mocha
+  rake
+  sqlite3 (~> 1.4)
+
+BUNDLED WITH
+   2.4.22
diff --git a/lib/migration_tools/tasks.rb b/lib/migration_tools/tasks.rb
@@ -28,7 +28,12 @@ def migrations_paths
     end
 
     def migrator(target_version = nil)
-      if ActiveRecord::VERSION::MAJOR >= 6
+      if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+        migrate_up(ActiveRecord::MigrationContext.new(
+          migrations_paths,
+          ActiveRecord::Base.connection.schema_migration
+        ).migrations, target_version)
+      elsif ActiveRecord::VERSION::MAJOR >= 6
         migrate_up(ActiveRecord::MigrationContext.new(
           migrations_paths,
           ActiveRecord::SchemaMigration
@@ -41,7 +46,13 @@ def migrator(target_version = nil)
     end
 
     def migrate_up(migrations, target_version)
-      if ActiveRecord::VERSION::MAJOR  >= 6
+      if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+        ActiveRecord::Migrator.new(:up, migrations,
+          ActiveRecord::Base.connection.schema_migration,
+          ActiveRecord::Base.connection.internal_metadata,
+          target_version
+        )
+      elsif ActiveRecord::VERSION::MAJOR >= 6
         ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration, target_version)
       else
         ActiveRecord::Migrator.new(:up, migrations, target_version)
@@ -88,8 +99,14 @@ def define_migrate_group
                 migrator(migration.version).run
               end
 
-              Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
-              Rake::Task["db:structure:dump"].invoke if ActiveRecord::Base.schema_format == :sql
+              schema_format = if ActiveRecord::VERSION::MAJOR >= 7
+                                ActiveRecord.schema_format
+                              else
+                                ActiveRecord::Base.schema_format
+                              end
+
+              Rake::Task["db:schema:dump"].invoke if schema_format == :ruby
+              Rake::Task["db:structure:dump"].invoke if schema_format == :sql
             end
           end
         end
diff --git a/migration_tools.gemspec b/migration_tools.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new "migration_tools", "1.8.0" do |s|
 
   s.required_ruby_version = '>= 2.6.0'
 
-  s.add_runtime_dependency "activerecord", '>= 4.2.0', '< 7.1'
+  s.add_runtime_dependency "activerecord", '>= 4.2.0', '< 7.2'
 
   s.add_development_dependency "rake"
   s.add_development_dependency "bump"
