activerecord 8.1.3.1 → 8.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 634b5e9543d35ba0aa1b4d18b06a0b49a8c4cc56057fd2a050a9d00805d649a3
-  data.tar.gz: fe583e47b47f1a9b03d04e073b3109545d83c37eafb8c490adecc07c07fb656d
+  metadata.gz: 5fa58a44daca2d6355264162e3a8f7df6249f432fd3e980b14ffbba7b0aa732c
+  data.tar.gz: 706535a8d0930e833eefe7cb2b7e971e0ff1b5297028ced6e53c42a3ae2cd40d
 SHA512:
-  metadata.gz: 7eadc3d4b13e69414c53fb9c619ca778673b4f3d7b91b809eac8103e792ecf2c4d25dd53c58e98ebf7dda92e107a4f4e936822e21a35a6ecdd51c9ec5c8b0fc4
-  data.tar.gz: 3f0b7431b03aa81dc8586b851d1c719c3d8465d7fce3938e225b9972c0346b236c5c579d34c89e1a3a1dbe22337f2b52e2213006226fc68dddacc36f979eb231
+  metadata.gz: 222277a1c6de4a2c59894eb4c3f1c272482a67ef0eb268edde6c0c70b57e5044c24988273a2a13f1433c3d7f18574e88ad33ea0d994251f01eacdf8b5397c1ae
+  data.tar.gz: 476e3611c860d38fed3cee992e8848218f38fd12e505d4463541d1f7015006ef481d224df4263c7f1168f4349e25fa8509ef35dffc9f44858e9e6cf210c99522

data/CHANGELOG.md

@@ -1,3 +1,620 @@
+## Rails 8.1.4 (September 24, 2026) ##
+
+*   Avoid deadlocks when concurrent `find_or_create_by` calls read back the same
+    record within MySQL transactions.
+
+    Use a shared lock for the read after a duplicate insert, preserving visibility
+    under REPEATABLE READ without upgrading competing shared locks to exclusive locks.
+    This also applies to `create_or_find_by` and the bang variants of both methods.
+
+    Fixes #54281.
+
+    *Kirsten Westeinde*
+
+*   Filter the database password out of failed `db:` task command error messages.
+
+    *Ngan Pham*
+
+*   Fix `ActiveRecord::TypeCaster::Connection` sometimes leaking a checked-out
+    connection.
+
+    *Hartley McGuire*
+
+*   Fix PostgreSQL exclusion constraints with multiline expressions being parsed
+    incorrectly during schema introspection.
+
+    *Jake McAllister*
+
+*   Fix async `ActiveRecord::StatementCache#execute` raising an error for
+    out-of-range bind values instead of returning an empty result.
+
+    *viralpraxis*
+
+*   Fix `where` clauses with column-tuple syntax not resolving references to
+    other tables.
+
+    *Chris Gunther*
+
+*   Fix `distinct: true` being ignored by `average`.
+
+    *Kenta Ishizaki*
+
+*   Fix `belongs_to` change tracking for composite foreign keys.
+
+    Only the first foreign key column was checked for changes; now all foreign
+    key columns are checked.
+
+    *Anas Khan*
+
+*   Make `add_column(if_not_exists: true)` reversible.
+
+    *Kenta Ishizaki*
+
+*   Quote the index name in MySQL `enable_index` and `disable_index`.
+
+    Unquoted index names containing special characters could cause SQL syntax
+    errors.
+
+    *Kenta Ishizaki*
+
+*   Make `remove_foreign_key(if_exists: true)` reversible.
+
+    *Kenta Ishizaki*
+
+*   Fix `distinct: true` being ignored by grouped `sum`.
+
+    *Kenta Ishizaki*
+
+*   Return an `ActiveRecord::Promise` from `async_ids` on a contradictory
+    relation, instead of a plain `ActiveRecord::Result`.
+
+    *Kenta Ishizaki*
+
+*   Fix reversibility check for `drop_virtual_table`.
+
+    The wrong argument was extracted, so the check for whether options were
+    given could pass or fail incorrectly.
+
+    *Kenta Ishizaki*
+
+*   Fix `remove_check_constraint(if_exists: true)` incorrectly raising when
+    removing by expression.
+
+    The `if_exists` check did not pass the expression to
+    `check_constraint_exists?`, so it could not find the constraint.
+
+    *Kenta Ishizaki*
+
+*   Clear PostgreSQL notices as they are handled, preventing warnings from
+    leaking to subsequent queries.
+
+    *Matthew Draper*
+
+*   Fix `WeakThreadKeyMap` raising "can't add a new key into hash during
+    iteration" when connections are checked in from multiple threads.
+
+    *Matthew Draper*
+
+*   Continue pool disconnect after a connection's cleanup or disconnect raises.
+
+    Previously, a failure on one connection aborted the teardown, stranding
+    remaining connections and their resources.
+
+    *Matthew Draper*
+
+*   Fix race condition between `preconnect` and the connection pool reaper.
+
+    *Yasuo Honda*
+
+*   Fix `in_order_of` raising when the column is a CTE reference.
+
+    *viralpraxis*
+
+*   Fix `content_columns` including composite primary key components.
+
+    Only the first primary key column was excluded; now all primary key columns
+    are excluded.
+
+    *Kenta Ishizaki*
+
+*   Treat `remove_column` with options but no type as irreversible.
+
+    Previously, `remove_column(:table, :column, default: nil)` would not raise
+    `IrreversibleMigration` because the options hash was mistaken for a column
+    type.
+
+    *Kenta Ishizaki*
+
+*   Fix `counter_cache_column` crashing when `:counter_cache` is given as a
+    Hash without a `:column` key.
+
+    *Kenta Ishizaki*
+
+*   Coerce `seeds` and `use_metadata_table` to booleans in `UrlConfig`.
+
+    When configured via `DATABASE_URL`, these options were left as strings
+    instead of being coerced to booleans like `replica` and `database_tasks`.
+
+    *Kenta Ishizaki*
+
+*   Fix `excluding` (and its `without` alias) to work with composite primary key
+    models. Records passed to `excluding` are now matched by their full composite id
+    instead of being looked up by a single primary key column.
+
+    *Kenta Ishizaki*
+
+*   Fix `Relation#delete` raising on a single composite primary key id.
+
+    `Model.delete(id)` now wraps a single composite id in an array before building
+    the `WHERE` clause, so a single record can be deleted by its composite id.
+
+    *Kenta Ishizaki*
+
+*   Fix reading a composite primary key after a partial `select` returning the
+    raw value instead of `nil` for unselected key columns.
+
+    The attribute defaults builder excluded only the single primary key column from
+    defaults; for composite primary keys it left the unselected key columns in the
+    defaults, so `record.id` returned an array of raw column values instead of
+    `[nil, nil]`. All primary key columns are now excluded.
+
+    *Kenta Ishizaki*
+
+*   Fix `find` with an empty array on a composite primary key model returning the
+    argument array instead of `[]`.
+
+    `Model.find([])` now returns a fresh empty array for composite primary key
+    models, matching single-key models.
+
+    *Kenta Ishizaki*
+
+*   Fix `find` with an order clause and an offset past the end of the ids raising
+    `RecordNotFound` instead of returning an empty result.
+
+    *Kenta Ishizaki*
+
+*   Fix `in_order_of` dropping values that cannot be serialized for the column
+    instead of turning them into an `IS NULL` match.
+
+    Out-of-range integers and unknown enum keys are now ignored rather than
+    silently matching rows with `NULL` in that column. When all requested values
+    are unrepresentable, the relation returns no rows instead of building an empty
+    `CASE` expression.
+
+    *Kenta Ishizaki*
+
+*   Fix stale `finder_needs_type_condition?` memo after the schema cache is reloaded.
+
+    When an STI model's `type` column was removed and re-added (e.g. via a
+    migration) and `reset_column_information` was called, the cached
+    `finder_needs_type_condition` value was not cleared, so queries could omit the
+    STI type condition. The memo is now reset on `reload_schema_from_cache`.
+
+    *Kenta Ishizaki*
+
+*   Fix PostgreSQL schema dump to qualify `enum_type` when the same enum name exists
+    in different schemas.
+
+    Previously the dumped `enum_type` used the bare type name, which could resolve to
+    the wrong enum in another schema. It now uses the schema-qualified name.
+
+    *fatkodima*
+
+*   Fix PostgreSQL index introspection to parse opclasses from another schema.
+
+    Index expressions using a schema-qualified opclass (e.g.
+    `USING gin(position test_schema.gin_trgm_ops)`) are now parsed correctly so the
+    opclass is captured without the schema prefix.
+
+    *Nicolas Vandenboegaerde*
+
+*   Fix `belongs_to` `:touch` with composite foreign keys.
+
+    Touching the parent record when a `belongs_to` with a composite foreign key
+    changes or is destroyed now correctly resolves the old and new parent by all
+    foreign key columns.
+
+    *Romulo Storel*
+
+*   Fix `add_index` `comment:` option on a schema-qualified PostgreSQL table.
+
+    The `COMMENT ON INDEX` statement now schema-qualifies the index name, so the
+    comment is applied to the index in the correct schema instead of raising.
+
+    *Tobias Egli*
+
+*   Fix `check_all_foreign_keys_valid!` on PostgreSQL partitioned tables.
+
+    The validation query previously matched constraints by name across all tables in
+    the schema, marking unrelated constraints (including partition children) as not
+    validated. It now scopes the update to the specific table.
+
+    *Alexis Andrieu*
+
+*   Revert stable sorting of columns and indexes in serialized schema caches.
+
+    `SchemaCache#encode_with` no longer sorts a table's columns and indexes by name
+    when writing the cache, restoring the pre-8.1 behavior.
+
+    *Jean Boussier*
+
+*   Fix `only_columns` to enumerate columns in the `SELECT` clause.
+
+    Models using `only_columns` were generating `SELECT *` instead of an explicit
+    column list, which could select columns that were meant to be excluded.
+
+    *sarub0b0*
+
+*   Fix `eager_load` with a composite primary key and an explicit `select`.
+
+    The join dependency used the single primary key value to build aliases; for
+    composite primary keys it now uses the full array of primary key columns, so
+    eager loading with a custom `select` no longer drops the association records.
+
+    *fatkodima*
+
+*   Fix `find_signed` with a composite primary key.
+
+    `find_signed` now wraps the decoded id in an array so `find_by` matches against
+    all primary key columns, instead of silently returning `nil`.
+
+    *Kenta Ishizaki*
+
+*   Fix `with_connection(prevent_permanent_checkout: true)` clearing a sticky lease
+    that was already set by `lease_connection`.
+
+    A `with_connection` call with `prevent_permanent_checkout: true` no longer resets
+    `lease.sticky` to its previous value when the connection was already sticky, so
+    the connection remains checked out after the block.
+
+    *Ben Sheldon*
+
+*   Fix `reset_counters` to cast string ids to the primary key type.
+
+    `reset_counters` called with a string id (the form ids take from request params)
+    failed to find the record for both single and composite primary keys. Each id is
+    now cast against its own column type.
+
+    *fatkodima*
+
+*   Fix `belongs_to` presence validation for composite foreign keys.
+
+    The required-association validation only checked the first foreign key column.
+    For composite foreign keys it now considers the association present only when
+    none of the foreign key columns are `nil`, and changed when any of them changed.
+
+    *Felix Descoteaux*
+
+*   Fix preloading a `belongs_to` with a composite foreign key when some key columns
+    are `nil`.
+
+    The preloader now skips owners whose composite key has any `nil` component
+    instead of issuing a query that matches unrelated rows.
+
+    *Rose Wiegley*
+
+*   Fix `belongs_to` inverse matching with composite foreign keys.
+
+    `inversable?` compared a single foreign key column against a single primary key,
+    so `belongs_to` associations with composite foreign keys never matched their
+    inverse. Foreign key and primary key values are now compared component by
+    component.
+
+    *Martin Samson*
+
+*   Fix `validate_table_length!` to ignore the schema prefix on PostgreSQL.
+
+    Schema-qualified table names (e.g. `"schema.very_long_table_name"`) were
+    incorrectly rejected as exceeding the table name length limit because the schema
+    prefix was counted. The schema is now stripped before checking the length.
+
+    *fatkodima*
+
+*   Fix passing Trilogy SSL options to `mysql` and `mysqldump` commands.
+
+    *Ngan Pham*
+
+*   Fix `keepalive: false` in `database.yml` falling back to the
+    600 second default.
+
+    *Joe Sak*
+
+*   Fix connection checkout blocking past the configured `checkout_timeout` while
+    waiting behind background connection maintenance.
+
+    `ConnectionPool#try_to_queue_for_background_connection` waited up to a
+    hardcoded 100 seconds for a connection tied up in maintenance (e.g. a keepalive
+    ping), regardless of the pool's configured `checkout_timeout`. If maintenance
+    stalled (a slow or unresponsive database server), checkout could block for far
+    longer than the caller asked for.
+
+    *Joe Sak*
+
+*   Fix encrypted fixtures for JSON columns.
+
+    Encrypted fixture values were serialized twice: once by the encrypted
+    attribute type and again by the column type when the rows were inserted.
+    For `json`/`jsonb` columns this stored the encrypted payload as a JSON
+    string, which then failed to decrypt. The payload is now handed back in
+    the column's cast form so it round-trips through the column type.
+
+    *Carlos Daniel Pohlod*
+
+*   Fix performance regression in `method_missing` for virtual SELECT alias
+    attributes.
+
+    Fixes #57183.
+
+    *Hammad Khan*
+
+*   Column defaults are no longer eagerly deserialized.
+
+    Restore the Active Record 8.0 and older behavior.
+    Column defaults are now whatever is returned by the database, generally a string.
+
+    This was changed in 8.1.0 to make the attribute API more consistent,
+    however it caused problems when the attribute type is later changed in the model.
+
+    Typically, some databases treat boolean columns as small integers, ance once the
+    default integer is casted to a boolean, it's not longer possible to change the
+    attribute back into an integer in the model.
+
+    Before:
+
+    ```ruby
+    Person.columns_hash["age"].default # => 0
+    ```
+
+    After:
+
+    ```ruby
+    Person.columns_hash["age"].default # => "0"
+    ```
+
+    See https://github.com/rails/rails/issues/58292.
+
+    *Jean Boussier*
+
+*   Preserve the declared parent order when dumping PostgreSQL `INHERITS` table options.
+
+    The schema dumper read a table's inherited parents without an `ORDER BY`, so the
+    `INHERITS (...)` clause in `schema.rb` could be emitted in a nondeterministic order.
+    Parents are now ordered by `pg_inherits.inhseqno`.
+
+    *viralpraxis*
+
+*   Preserve SQLite partial and expression indexes when their stored SQL contains newlines.
+
+    *Javi Ramírez*
+
+*   Only use multi statement for `SET TRANSACTION ISOLATION LEVEL; BEGIN` if
+    MySQL connection is configured to use multi statement.
+
+    *Eliseu Daroit*, *Hartley McGuire*, *Matthew Draper*
+
+*   Mark a connection unverified when a non-`StandardError` interrupts a query.
+
+    A query interrupted by a non-`StandardError`, such as a fiber scheduler's
+    cancel or a `Timeout`, leaves the connection desynced. Active Record
+    previously returned it to the pool still marked verified, so the next
+    checkout reused it and failed on a dead socket. The connection is now
+    marked unverified, so it re-verifies and reconnects before its next use.
+
+    *Eliseu Daroit*
+
+*   Fix `has_many` and `has_one` associations on a new record returning an empty
+    result when the owner has a composite primary key, even when every primary
+    key column is populated.
+
+    *Jean-Samuel Aubry-Guzzi*
+
+*   Fix inverse association matching for `has_many` and `has_one` associations
+    with association-specific composite primary keys.
+
+    *Hugo Vacher*
+
+*   Fix `ActiveRecord::Base.with` to call `Object#with` when given a block.
+
+    The class-level `with` delegates to the relation's CTE query method, which
+    does not accept a block. When a block is passed, it now delegates to
+    `Object#with` instead, so it can be used to temporarily set attributes on
+    the class for the duration of the block.
+
+    *Janko Marohnić*
+
+*   Fix `serialize` with `coder: ActiveRecord::Coders::JSON` silently double-encoding
+    a native `json`/`jsonb` column.
+
+    *Kenta Ishizaki*
+
+*   Fix `update_all` / `delete_all` ignoring `group` and `having`, updating or
+    deleting every row in the table instead of only the rows that satisfy the
+    `HAVING` clause.
+
+    *Kenta Ishizaki*
+
+*   Fix `ActiveRecord::Relation#cache_key` / `cache_version` for a loaded collection
+    containing a record without a timestamp.
+
+    *Kenta Ishizaki*
+
+*   Fix model `filter_attributes` to not add useless filters into `config.filter_parameters`.
+
+    Proc and Regexp filters would be improperly turned into string matchers.
+    Now they are skipped.
+
+    *Jonathan Calvert*
+
+*   Fix `ActiveRecord::MessagePack` serialization raising `NoMethodError`
+    for any record with a populated `time` column, which made such records
+    uncacheable through the MessagePack cache serializer.
+
+    *Kenta Ishizaki*
+
+*   Fix replacing or clearing a polymorphic `has_one` leaving a stale type column
+    on the removed record.
+
+    *Kenta Ishizaki*
+
+*   Fix `accepts_nested_attributes_for` `:limit` miscounting a single-record hash.
+
+    *Kenta Ishizaki*
+
+*   Fix `rename_index` to preserve a partial index's `WHERE` for SQLite and older MySQL/MariaDB versions.
+
+    *Kenta Ishizaki*
+
+*   Fix PostgreSQL `foreign_keys` returning a corrupted `to_table` for a foreign key
+    that references a table in a quoted schema.
+
+    *Kenta Ishizaki*
+
+*   Fix grouped calculations (e.g. `count`) grouped by a `belongs_to` association
+    that points to a composite primary key model.
+
+    `Book.group(:order).count`, where `Book belongs_to :order` and `Order` has a
+    composite primary key, raised `ArgumentError: Expected corresponding value
+    for ["shop_id", "id"] to be an Array`. The grouped result is now keyed by the
+    associated records as it already is for single-column keys.
+
+    *Kenta Ishizaki*
+
+*   Fix `has_many`/`has_one :through` associations with `disable_joins: true`
+    silently returning an empty result when the source points to a composite
+    primary key model.
+
+    *Kenta Ishizaki*
+
+*   Fix collection association `ids=` writers (e.g. `author.book_ids=`) raising
+    `ActiveRecord::RecordNotFound` for existing records when a composite primary
+    key model is assigned string ids (the shape ids take from request params).
+
+    Each id component is now cast against its own column type, instead of casting
+    the whole tuple against an array of column names, which `type_for_attribute`
+    can't resolve to a real type (so the cast was a no-op and the string ids
+    never matched the loaded records).
+
+    *Kenta Ishizaki*
+
+*   Fix `find` with multiple composite primary key ids passed as strings
+    silently returning `[]`.
+
+    `Model.find([["1", "10"], ["1", "20"]])` (the shape ids take when they come
+    from request parameters) returned an empty array instead of the records and
+    without raising `RecordNotFound`. The ids were cast against the array of key
+    column names as a whole — which is a no-op — so the string tuples never
+    compared equal to the records' integer ids when ordering the result. Each
+    component is now cast against its own column type, matching the documented
+    coercion already performed for single-column keys.
+
+    *Kenta Ishizaki*
+
+*   Fix PostgreSQL `daterange` / `tsrange` / `tstzrange` schema dump producing
+    invalid Ruby.
+
+    The schema dumper used to render range defaults via `Range#inspect`, which
+    falls back to `Date#inspect` / `Time#inspect` for the bounds. The resulting
+    `schema.rb` literal (for example `default: Mon, 01 Jan 2024..Wed, 01 Jan 2025`)
+    raised a `SyntaxError` on `db:schema:load`. The bounds are now rendered via
+    the subtype's `type_cast_for_schema`, so date and timestamp range defaults
+    round-trip through `schema.rb` like any other column.
+
+    *Kenta Ishizaki*
+
+*   Fix deadlock when pool-less connection materializes while fetching database
+    server version.
+
+    *Hartley McGuire*
+
+*   Fix PostgreSQL range columns corrupting bounds that contain a comma.
+
+    `PostgreSQL::OID::Range#extract_bounds` split a range's textual
+    representation on the first comma, but PostgreSQL double-quotes any bound
+    that itself contains a comma (e.g. a range over a text subtype). A value
+    such as `["a,b","c,d")` was therefore split inside the first quoted bound
+    and read back with both endpoints corrupted. The split now skips over
+    double-quoted segments when locating the separating comma.
+
+    *Kenta Ishizaki*
+
+*   Fix store accessor `*_change` and `saved_change_to_*` reporting a change
+    for unchanged keys.
+
+    When one key of a `store` column changed, the generated `<key>_change` and
+    `saved_change_to_<key>` methods returned a `[value, value]` pair for the
+    column's *other* keys too, even though their matching `<key>_changed?` /
+    `saved_change_to_<key>?` correctly returned `false` and standard attribute
+    `_change` / `saved_change_to_*` methods return `nil` when unchanged. The
+    methods now return `nil` unless that specific key actually changed,
+    matching their predicate counterparts.
+
+    *Kenta Ishizaki*
+
+*   Reduce number of queries when introspecting MySQL/MariaDB tables.
+
+    A fix to support MariaDB function defaults caused the MySQL adapters to
+    issue one query per column when introspecting tables.
+
+    Now it only issue a single extra query per table, and only when using MariaDB.
+
+    *Iliana Hadzhiatanasova*
+
+*   Fully qualify query criterias in `has_and_belongs_to_many` associations.
+
+    Ensure that scopes with the same column name but in different tables aren't lost
+    when following an HABTM association.
+
+    *Philip Maina*
+
+*   Fix Active Record Pool Reaper thread leak after `Parallelization#shutdown`.
+
+    After parallelized test runs, the parent process leaked the Active Record Pool
+    Reaper thread, holding open connection pools and file descriptors for up to
+    `reaping_frequency` seconds (or indefinitely if never reaped).
+
+    Three fixes: `Parallelization#shutdown` now calls `run_cleanup_hooks`;
+    Active Record registers a cleanup hook that discards all connection pools; and
+    `ConnectionPool#discard!` now calls `Reaper.discard_pool`, which immediately
+    kills and joins the reaper thread when no pools remain at that frequency.
+
+    *Ruy Rocha*
+
+*   Fix duplicate `WHERE` conditions in `create_or_find_by`.
+
+    When `create_or_find_by` catches a `RecordNotUnique` error and retries the query, it now uses `rewhere` and `take!` to prevent duplicating existing scope conditions.
+
+    *Yavor Dashev*
+
+*   Fix `ActiveRecord::QueryMethods#in_order_of` when passing an out-of-range Integer
+
+    To match the behavior of the `Enumerable` version, `in_order_of` now ignores an out-of-range Integer.
+
+    *tejanium*
+
+*   Revert alphabetical sorting of table columns inside `schema.rb`.
+
+    Alphabetical sorting of table columns inside the schema creates improper production tables when using `db:prepare`.
+
+    *Bert McCutchen*
+
+*   Fix `strict_loading` violations ignored when using `pluck`
+
+    *Johnson Chan*
+
+*   Fix incorrect callback execution order when `config.active_record.run_after_transaction_callbacks_in_order_defined = true`
+    and using `after_commit` and `after_rollback` callbacks with `prepend: true`.
+
+    *Joshua Young*
+
+*   Fix `becomes` to preserve `marked_for_destruction?`.
+
+    *Vincent Robert*
+
+*   MySQL error 1046 (`ER_NO_DB_ERROR: No database selected`) is now retryable as a `ConnectionFailed` exception
+
+    *Clay Harmon*
+
+
 ## Rails 8.1.3.1 (July 29, 2026) ##
 
 *   No changes.

data/lib/active_record/associations/association.rb

@@ -232,6 +232,18 @@ module ActiveRecord
         _create_record(attributes, true, &block)
       end
 
+      def violates_strict_loading?
+        return unless find_target?
+
+        return if @skip_strict_loading
+
+        return unless owner.validation_context.nil?
+
+        return reflection.strict_loading? if reflection.options.key?(:strict_loading)
+
+        owner.strict_loading? && !owner.strict_loading_n_plus_one_only?
+      end
+
       # Whether the association represents a single record
       # or a collection of records.
       def collection?
@@ -281,16 +293,6 @@ module ActiveRecord
           @skip_strict_loading = skip_strict_loading_was
         end
 
-        def violates_strict_loading?
-          return if @skip_strict_loading
-
-          return unless owner.validation_context.nil?
-
-          return reflection.strict_loading? if reflection.options.key?(:strict_loading)
-
-          owner.strict_loading? && !owner.strict_loading_n_plus_one_only?
-        end
-
         # The scope for this association.
         #
         # Note that the association_scope is merged into the target_scope only when the
@@ -409,12 +411,28 @@ module ActiveRecord
         end
 
         def matches_foreign_key?(record)
-          if foreign_key_for?(record)
-            record.read_attribute(reflection.foreign_key) == owner.id ||
-              (foreign_key_for?(owner) && owner.read_attribute(reflection.foreign_key) == record.id)
-          else
-            owner.read_attribute(reflection.foreign_key) == record.id
-          end
+          (foreign_key_for?(record) && record_foreign_key_matches_owner?(record)) ||
+            (foreign_key_for?(owner) && owner_foreign_key_matches_record?(record))
+        end
+
+        def record_foreign_key_matches_owner?(record)
+          foreign_key_values(record) == active_record_primary_key_values(owner)
+        end
+
+        def owner_foreign_key_matches_record?(record)
+          foreign_key_values(owner) == association_primary_key_values(record)
+        end
+
+        def foreign_key_values(record)
+          Array(reflection.foreign_key).map { |key| record.read_attribute(key) }
+        end
+
+        def active_record_primary_key_values(record)
+          Array(reflection.active_record_primary_key).map { |key| record.read_attribute(key) }
+        end
+
+        def association_primary_key_values(record)
+          Array(reflection.association_primary_key(record.class)).map { |key| record.read_attribute(key) }
         end
     end
   end