diff options
Diffstat (limited to 'activerecord/lib/active_record/reflection.rb')
| -rw-r--r-- | activerecord/lib/active_record/reflection.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index 467d92e53c..95485ddada 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -205,8 +205,11 @@ module ActiveRecord @scope_lock = Mutex.new end - def association_scope_cache(conn) + def association_scope_cache(conn, owner) key = conn.prepared_statements + if options[:polymorphic] + key = [key, owner.read_attribute(@foreign_type)] + end @association_scope_cache[key] ||= @scope_lock.synchronize { @association_scope_cache[key] ||= yield } |