Skip to content

Commit def54b2

Browse files
committed
Replace scope.name with a comparison on both table_name and connection_specification_name
1 parent b8f19c9 commit def54b2

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

activerecord/lib/active_record/associations/preloader/association.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ def initialize(scope, association_key_name)
1616

1717
def eql?(other)
1818
association_key_name == other.association_key_name &&
19-
scope.name == other.scope.name &&
19+
scope.table_name == other.scope.table_name &&
20+
scope.connection_specification_name == other.scope.connection_specification_name &&
2021
scope.values_for_queries == other.scope.values_for_queries
2122
end
2223

2324
def hash
24-
[association_key_name, scope.name, scope.values_for_queries].hash
25+
[association_key_name, scope.table_name, scope.connection_specification_name, scope.values_for_queries].hash
2526
end
2627

2728
def records_for(loaders)

0 commit comments

Comments
 (0)