Update CI Rubies / remove unnecessary steps

Author: malomalo

.github/workflows/ci.yml

@@ -8,12 +8,13 @@ on:
 jobs:
   sunstone:
     name: ActiveRecord::Filter Test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
+      fail-fast: false
       matrix:
-        rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
-        ruby-version: ['3.2', '3.3', '3.4']
+        rails: ['7.1.5.1', '7.2.2.1', '8.0.2']
+        ruby-version: ['3.2', '3.3', '3.4', '3.5.0-preview1']
         postgres-version: ['17']
 
     steps:
@@ -53,14 +54,18 @@ jobs:
 
   ar-postgresql:
     name: ActiveRecord PostgresQL Test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       fail-fast: false
       matrix:
-        rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
-        ruby-version: ['3.3']
+        rails: ['7.1.5.1', '7.2.2.1', '8.0.2']
+        ruby-version: ['3.4']
         postgres-version: ['17']
+        exclude:
+          - rails: '7.1.5.1'
+            ruby-version: '3.4'
+            postgres-version: '17'
 
     steps:
       - name: Install Postgresql
@@ -108,14 +113,17 @@ jobs:
           
   ar-sqlite:
     name: ActiveRecord SQLite Test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
 
     strategy:
       fail-fast: false
       matrix:
-        rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
-        ruby-version: ['3.3']
+        rails: ['7.1.5.1', '7.2.2.1', '8.0.2']
+        ruby-version: ['3.4']
+        exclude:
+          - rails: '7.1.5.1'
+            ruby-version: '3.4'
 
     steps:
       - uses: actions/checkout@v4
@@ -152,13 +160,16 @@ jobs:
         
   ar-mysql:
     name: ActiveRecord MySQL Test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       fail-fast: false
       matrix:
-        rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
-        ruby-version: ['3.3']
+        rails: ['7.1.5.1', '7.2.2.1', '8.0.2']
+        ruby-version: ['3.4']
+        exclude:
+          - rails: '7.1.5.1'
+            ruby-version: '3.4'
 
     steps:
       - name: Install MySQL

lib/active_record/filter/filter_clause_factory.rb

@@ -1,7 +1,7 @@
 class ActiveRecord::Filter::FilterClauseFactory
 
   def initialize(model, predicate_builder)
-    @model = model
+    @klass = model
     @predicate_builder = predicate_builder
   end
 
@@ -17,6 +17,6 @@ def build(filters, alias_tracker)
 
   protected
 
-  attr_reader :model, :predicate_builder
+  attr_reader :klass, :predicate_builder
 
 end

lib/active_record/filter/predicate_builder_extension.rb

@@ -68,7 +68,11 @@ def build_filter_joins(klass, filters, relations=[], custom=[])
           elsif !klass.columns_hash.has_key?(key.to_s) && key.to_s.end_with?('_ids') && reflection = klass._reflections[key.to_s.gsub(/_ids$/, 's').to_sym]
             relations << reflection.name
           elsif reflection = klass.reflect_on_all_associations(:has_and_belongs_to_many).find {|r| r.join_table == key.to_s && value.keys.first.to_s == r.association_foreign_key.to_s }
-            reflection = klass._reflections[klass._reflections[reflection.name].send(:delegate_reflection).options[:through]]
+            reflection = klass._reflections[
+              # TODO: remove right || after droping support for Rails < 7.2
+              (klass._reflections[reflection.name] || klass._reflections[reflection.name.to_s])
+              .send(:delegate_reflection).options[:through]
+            ]
             relations << { reflection.name => build_filter_joins(reflection.klass, value) }
           else
             {key => value}