activerecord_where_assoc 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd0fae20ed7a2ae8fac19fda0df7f70b9b6a842a6519684c66c571dbf2f57732
-  data.tar.gz: f570a564494a52517dde7aad62c79b571ab3d1e49d651f32ac2bb86b301fa4f6
+  metadata.gz: 4d915a4b0f214283acc2a6ba098018b17fc786f2b801eb2703eba31448b127b9
+  data.tar.gz: 614b3c59444a0f6676b63f2499718b16f95ac1d1b010e18e322b10d25be21e1a
 SHA512:
-  metadata.gz: 240832561dd8eb5cc93ff3ebc239a0aedf8f9f79520a6404ffe6ac8f9d1b2cacd5f0057d85066ed889b62f16b5e85125acb8b943c91fa72ab0450a366d7d7569
-  data.tar.gz: 060f842df0bd69b72ac0e6f0a64ef222b347047d693046abe83a9bfdd6797109e202bcccc32f75a3e7bc4349f1b5a50c94982102571a699b113e65331ebca459
+  metadata.gz: 1baf41c6ae6094045794f1c5a01c4ff3ab1218d9bc027b51e038667a76d210aa7c8819a1eb61404032fb906233400a9da2f7112a94e0610e5b546c1ef7373934
+  data.tar.gz: a1fbc573c244b8ea12cf8bd96b0de0ab248bc14ef5eeb5f1503715951e746ccae9e103fa98baee2f666c971496732bd4f938ece8d77cea6770ad1614d3feed43

data/CHANGELOG.md

@@ -1,12 +1,16 @@
 # Unreleased
 
+# 1.1.4 - 2023-10-10
+
+* Add compatibility for Rails 7.1
+
 # 1.1.3 - 2022-08-16
 
 * Add support for associations defined on abstract models
 
 # 1.1.2 - 2020-12-24
 
-* Add compatiblity for Rails 6.1
+* Add compatibility for Rails 6.1
 
 # 1.1.1 - 2020-04-13
 

data/lib/active_record_where_assoc/active_record_compat.rb

@@ -91,5 +91,15 @@ module ActiveRecordWhereAssoc
         reflection.is_a?(ActiveRecord::Reflection::ThroughReflection)
       end
     end
+
+    if ActiveRecord.gem_version >= Gem::Version.new("7.1.0.alpha")
+      def self.null_relation?(reflection)
+        reflection.null_relation?
+      end
+    else
+      def self.null_relation?(reflection)
+        reflection.is_a?(ActiveRecord::NullRelation)
+      end
+    end
   end
 end

data/lib/active_record_where_assoc/core_logic.rb

@@ -13,7 +13,7 @@ module ActiveRecordWhereAssoc
     # => "EXISTS (SELECT... *relation1*) OR EXISTS (SELECT... *relation2*)"
     def self.sql_for_any_exists(relations)
       relations = [relations] unless relations.is_a?(Array)
-      relations = relations.reject { |rel| rel.is_a?(ActiveRecord::NullRelation) }
+      relations = relations.reject { |rel| ActiveRecordCompat.null_relation?(rel) }
       sqls = relations.map { |rel| "EXISTS (#{rel.select('1').to_sql})" }
       if sqls.size > 1
         "(#{sqls.join(" OR ")})" # Parens needed when embedding the sql in a `where`, because the OR could make things wrong
@@ -33,7 +33,7 @@ module ActiveRecordWhereAssoc
     # => "SUM((SELECT... *relation1*)) + SUM((SELECT... *relation2*))"
     def self.sql_for_sum_of_counts(relations)
       relations = [relations] unless relations.is_a?(Array)
-      relations = relations.reject { |rel| rel.is_a?(ActiveRecord::NullRelation) }
+      relations = relations.reject { |rel| ActiveRecordCompat.null_relation?(rel) }
       # Need the double parentheses
       relations.map { |rel| "SUM((#{rel.to_sql}))" }.join(" + ").presence || "0"
     end
@@ -85,7 +85,7 @@ module ActiveRecordWhereAssoc
       end
 
       nested_relations = relations_on_association(record_class, association_names, given_conditions, options, deepest_scope_mod, NestWithSumBlock)
-      nested_relations = nested_relations.reject { |rel| rel.is_a?(ActiveRecord::NullRelation) }
+      nested_relations = nested_relations.reject { |rel| ActiveRecordCompat.null_relation?(rel) }
       nested_relations.map { |nr| "COALESCE((#{nr.to_sql}), 0)" }.join(" + ").presence || "0"
     end
 
@@ -334,7 +334,7 @@ module ActiveRecordWhereAssoc
       end
 
       # No need to do transformations if this is already a NullRelation
-      return current_scope if current_scope.is_a?(ActiveRecord::NullRelation)
+      return current_scope if ActiveRecordCompat.null_relation?(current_scope)
 
       current_scope = current_scope.limit(1) if reflection.macro == :has_one
 

data/lib/active_record_where_assoc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordWhereAssoc
-  VERSION = "1.1.3".freeze
+  VERSION = "1.1.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_where_assoc
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Maxime Handfield Lapointe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -31,6 +31,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Make ActiveRecord do conditions on your associations