Require Rails 7.0

.github/workflows/ci.yaml

@@ -15,9 +15,6 @@ jobs:
         - '2.7'
         - '3.0'
         - '3.1'
-        rails-version:
-        - '6.1'
-        - '7.0'
     services:
       postgres:
         image: postgres:13
@@ -42,7 +39,6 @@ jobs:
       PGPORT: 5432
       PGUSER: postgres
       PGPASSWORD: password
-      TEST_RAILS_VERSION: ${{ matrix.rails-version }}
       # for the mysql cli (mysql, mysqladmin)
       MYSQL_HOST: 127.0.0.1
       MYSQL_PWD: password
@@ -68,7 +64,7 @@ jobs:
           DB: mysql2
         run: bundle exec rake
       - name: Report code coverage
-        if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' && matrix.rails-version == '6.1' }}
+        if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' }}
         continue-on-error: true
         uses: paambaati/codeclimate-action@v8
         env:

Gemfile

@@ -2,15 +2,7 @@
 
 source "https://rubygems.org"
 
-minimum_version =
-  case ENV['TEST_RAILS_VERSION']
-  when "7.0"
-    "~>7.0.8"
-  else
-    "~>6.1.4"
-  end
-
-gem "activerecord", minimum_version
+gem "activerecord", "~>7.0.8"
 gem "mysql2"
 gem "pg"
 gem "sqlite3", "< 2"

lib/active_record/virtual_attributes/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module VirtualAttributes
-    VERSION = "6.1.2".freeze
+    VERSION = "7.0.0".freeze
   end
 end

lib/active_record/virtual_attributes/virtual_fields.rb

@@ -110,20 +110,12 @@ def assert_klass_has_instance_method(klass, instance_method)
   raise NameError, msg
 end
 
-if ActiveRecord.version >= Gem::Version.new(7.0) # Rails 7.0 expected methods to patch
-  %w[
-    grouped_records
-  ].each { |method| assert_klass_has_instance_method(ActiveRecord::Associations::Preloader::Branch, method) }
-elsif ActiveRecord.version >= Gem::Version.new(6.1) # Rails 6.1 methods to patch
-  %w[
-    preloaders_for_reflection
-    preloaders_for_hash
-    preloaders_for_one
-    grouped_records
-  ].each { |method| assert_klass_has_instance_method(ActiveRecord::Associations::Preloader, method) }
-end
+# Expect these methods to exist. (Otherwise we are patching the wrong methods)
+%w[
+  grouped_records
+  preloaders_for_reflection
+].each { |method| assert_klass_has_instance_method(ActiveRecord::Associations::Preloader::Branch, method) }
 
-# Expected methods to patch on any version
 %w[
   build_select
   arel_column
@@ -201,7 +193,7 @@ def preloaders_for_reflection(reflection, reflection_records)
             end
           end
         })
-      end if ActiveRecord.version >= Gem::Version.new(7.0)
+      end
     end
   end
 

spec/virtual_includes_spec.rb

@@ -541,13 +541,8 @@
   end
 
   def preloaded(records, associations, preload_scope = nil)
-    if ActiveRecord::Associations::Preloader.instance_methods.include?(:preload)
-      preloader = ActiveRecord::Associations::Preloader.new
-      preloader.preload(records, associations, preload_scope)
-    else
-      # Rails 7+ interface, see rails commit: e3b9779cb701c63012bc1af007c71dc5a888d35a
-      ActiveRecord::Associations::Preloader.new(records: records, associations: associations, scope: preload_scope).call
-    end
+    # Rails 7+ interface, see rails commit: e3b9779cb701c63012bc1af007c71dc5a888d35a
+    ActiveRecord::Associations::Preloader.new(:records => records, :associations => associations, :scope => preload_scope).call
     records
   end
 end