Merge pull request #48 from zendesk/edytaroz/rails_main_testing

Rails main testing

Author: zendesk-edytaroz

.github/workflows/rails_main_testing.yml

@@ -0,0 +1,26 @@
+name: Test against Rails main
+
+on:
+  schedule:
+    - cron: "0 0 * * *" # Run every day at 00:00 UTC
+  workflow_dispatch:
+  push:
+
+jobs:
+  specs:
+    name: Ruby${{ matrix.ruby }} rails_main test
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '3.3'
+    env:
+      BUNDLE_GEMFILE: gemfiles/rails_main.gemfile
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake test

.gitignore

@@ -19,3 +19,4 @@ pkg
 mkmf.log
 .bundle/config
 .bundle/environment.rb
+/gemfiles/rails_main.gemfile.lock

Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    migration_tools (1.9.0)
-      activerecord (>= 6.0.0, < 7.2)
+    migration_tools (1.10.0)
+      activerecord (>= 6.0.0)
 
 GEM
   remote: https://rubygems.org/

gemfiles/rails6.0.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    migration_tools (1.9.0)
-      activerecord (>= 6.0.0, < 7.2)
+    migration_tools (1.10.0)
+      activerecord (>= 6.0.0)
 
 GEM
   remote: https://rubygems.org/

gemfiles/rails6.1.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    migration_tools (1.9.0)
-      activerecord (>= 6.0.0, < 7.2)
+    migration_tools (1.10.0)
+      activerecord (>= 6.0.0)
 
 GEM
   remote: https://rubygems.org/

gemfiles/rails7.0.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    migration_tools (1.9.0)
-      activerecord (>= 6.0.0, < 7.2)
+    migration_tools (1.10.0)
+      activerecord (>= 6.0.0)
 
 GEM
   remote: https://rubygems.org/

gemfiles/rails7.1.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    migration_tools (1.9.0)
-      activerecord (>= 6.0.0, < 7.2)
+    migration_tools (1.10.0)
+      activerecord (>= 6.0.0)
 
 GEM
   remote: https://rubygems.org/

gemfiles/rails_main.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "activerecord", github: "rails/rails", branch: "main"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: ".."

lib/migration_tools/tasks.rb

@@ -28,11 +28,16 @@ def migrations_paths
     end
 
     def migrator(target_version = nil)
-      if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+      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.gem_version >= Gem::Version.new("7.2")
+        migrate_up(ActiveRecord::MigrationContext.new(
+          migrations_paths,
+          ActiveRecord::Base.connection_pool.schema_migration
+        ).migrations, target_version)
       else
         migrate_up(ActiveRecord::MigrationContext.new(
           migrations_paths,
@@ -42,11 +47,16 @@ def migrator(target_version = nil)
     end
 
     def migrate_up(migrations, target_version)
-      if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+      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.gem_version >= Gem::Version.new("7.2")
+        ActiveRecord::Migrator.new(:up, migrations,
+          ActiveRecord::Base.connection_pool.schema_migration,
+          ActiveRecord::Base.connection_pool.internal_metadata,
+          target_version)
       else
         ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration, target_version)
       end

migration_tools.gemspec

@@ -1,4 +1,4 @@
-Gem::Specification.new "migration_tools", "1.9.0" do |s|
+Gem::Specification.new "migration_tools", "1.10.0" do |s|
   s.description = "Rake tasks for Rails that add groups to migrations"
   s.summary = "Encourage migrations that do not require downtime"
   s.homepage = "https://github.com/zendesk/migration_tools"
@@ -9,7 +9,7 @@ Gem::Specification.new "migration_tools", "1.9.0" do |s|
 
   s.required_ruby_version = ">= 2.7.0"
 
-  s.add_runtime_dependency "activerecord", ">= 6.0.0", "< 7.2"
+  s.add_runtime_dependency "activerecord", ">= 6.0.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "bump"