activerecord_where_assoc 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 366ed8e028f8ed692b13cd8c487385ec380c57f41ce51edcd3370a2412ffe8f3
-  data.tar.gz: c6d2c1b2111cda267e7c5c6555692317ad0188cd748972f262acbdcba02eee7e
+  metadata.gz: 7ef06d95cd1fa0b3de7d06e745fc1a527bdc86415adb2e6b36b86b1f1477e804
+  data.tar.gz: 36a723c284fbb1e0b44ea9af5368995d504a53026817f545a14235212d4ae7bf
 SHA512:
-  metadata.gz: 1dd9b3955c50ec5ed37ca032b7aa20d93eac2ab035a914e1032efe1527a7b86cd33cd3832c3fa68010bfafef4780f2dfba473e99fa0f089bb3649c8aed578c27
-  data.tar.gz: 6bae922127f45e21c2484c3ef28f0d47512cb1d2cc0b1e94a97a628277698eceb04595b3f96759d367be1e94e4441ad72e8e2901aabf44169994989579b68d00
+  metadata.gz: 8a26660a18b817b6a5cd106e71413e064f899e6fb9c73e9f502a14fc5aeb2896412368bc932028300611c94adac234ebbff85d0e2fd3ed8b900c01fa6c5e2670
+  data.tar.gz: febe936611a53bc9f2f75aeb639fe8d8b905304b9b910e71f5cc9020ab1c0fae6803cd303f0cd7b830e29aa092778df21ce0303150f876930a02be2ed831821e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Unreleased
 
+# 1.2.0 - 2024-08-31
+
+* Add support for composite primary keys in Rails 7.2
+
 # 1.1.5 - 2024-05-18
 
 * Add compatibility for Rails 7.2
@@ -22,12 +26,12 @@
 
 # 1.1.0 - 2020-02-24
 
-* Added methods which return the SQL used by this gem: `assoc_exists_sql`, `assoc_not_exists_sql`, `compare_assoc_count_sql`, `only_assoc_count_sql`  
+* Added methods which return the SQL used by this gem: `assoc_exists_sql`, `assoc_not_exists_sql`, `compare_assoc_count_sql`, `only_assoc_count_sql`
   [Documentation for them](https://maxlap.github.io/activerecord_where_assoc/ActiveRecordWhereAssoc/SqlReturningMethods.html)
 
 # 1.0.1
 
-* Fix broken urls in error messages 
+* Fix broken urls in error messages
 
 # 1.0.0
 
@@ -35,16 +39,16 @@
 
 # 0.1.3
 
-* Use `SELECT 1` instead of `SELECT 0`...  
+* Use `SELECT 1` instead of `SELECT 0`...
   ... it just seems more natural that way.
 * Bugfixes
 
 # 0.1.2
 
-* It is now possible to pass a `Range` as first argument to `#where_assoc_count`.  
+* It is now possible to pass a `Range` as first argument to `#where_assoc_count`.
   Ex: Users that have between 10 and 20 posts
   `User.where_assoc_count(10..20, :==, :posts)`
-  The operator in that case must be either :== or :!=.  
-  This will use `BETWEEN` and `NOT BETWEEN`.  
+  The operator in that case must be either :== or :!=.
+  This will use `BETWEEN` and `NOT BETWEEN`.
   Ranges that exclude the last value, i.e. `5...10`, are also supported, resulting in `BETWEEN 5 and 9`.
   Ranges with infinities are also supported.

data/lib/active_record_where_assoc/core_logic.rb

@@ -364,6 +364,9 @@ module ActiveRecordWhereAssoc
       if reflection.klass.table_name.include?(".") || option_value(options, :never_alias_limit)
         # We use unscoped to avoid duplicating the conditions in the query, which is noise. (unless it
         # could helps the query planner of the DB, if someone can show it to be worth it, then this can be changed.)
+        if reflection.klass.primary_key.is_a?(Array)
+          raise NeverAliasLimitDoesntWorkWithCompositePrimaryKeysError, "Sorry, it just doesn't work..."
+        end
 
         reflection.klass.unscoped.where(reflection.klass.primary_key.to_sym => current_scope)
       else
@@ -395,8 +398,13 @@ module ActiveRecordWhereAssoc
 
       alias_scope = foreign_klass.base_class.unscoped
       alias_scope = alias_scope.from("#{table.name} #{ALIAS_TABLE.name}")
-      alias_scope = alias_scope.where(table[primary_key].eq(ALIAS_TABLE[primary_key]))
-      alias_scope
+
+      primary_key_constraints =
+        Array(primary_key).map do |a_primary_key|
+          table[a_primary_key].eq(ALIAS_TABLE[a_primary_key])
+        end
+
+      alias_scope.where(primary_key_constraints.inject(&:and))
     end
 
     def self.wrapper_and_join_constraints(record_class, reflection, options = {})
@@ -424,7 +432,18 @@ module ActiveRecordWhereAssoc
         foreign_table = ALIAS_TABLE
       end
 
-      constraints = table[key].eq(foreign_table[foreign_key])
+      constraint_keys = Array.wrap(key)
+      constraint_foreign_keys = Array.wrap(foreign_key)
+      constraint_key_map = constraint_keys.zip(constraint_foreign_keys)
+
+      primary_foreign_key_constraints =
+        constraint_key_map.map do |primary_and_foreign_keys|
+          a_primary_key, a_foreign_key = primary_and_foreign_keys
+
+          table[a_primary_key].eq(foreign_table[a_foreign_key])
+        end
+
+      constraints = primary_foreign_key_constraints.inject(&:and)
 
       if reflection.type
         # Handling of the polymorphic has_many/has_one's type column

data/lib/active_record_where_assoc/exceptions.rb

@@ -6,4 +6,7 @@ module ActiveRecordWhereAssoc
 
   class PolymorphicBelongsToWithoutClasses < StandardError
   end
+
+  class NeverAliasLimitDoesntWorkWithCompositePrimaryKeysError < StandardError
+  end
 end

data/lib/active_record_where_assoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_where_assoc
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Maxime Handfield Lapointe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-18 00:00:00.000000000 Z
+date: 2024-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -181,7 +181,7 @@ homepage: https://github.com/MaxLap/activerecord_where_assoc
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -196,8 +196,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: Make ActiveRecord do conditions on your associations
 test_files: []