diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-09-11 17:01:55 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-11 17:01:55 +0900 |
| commit | 80573a099e9974173a2f6d9a1ca81c7cc53ed3f4 (patch) | |
| tree | 911d74c37962a413550693fdd1d6668ff0745817 | |
| parent | ee79f0085b56e47ea69bd9f93cdb0a90da69568e (diff) | |
| parent | 32e1e70995a0c3f985dd2b5e9ce2295bc7b906ef (diff) | |
| download | rails-80573a099e9974173a2f6d9a1ca81c7cc53ed3f4.tar.gz rails-80573a099e9974173a2f6d9a1ca81c7cc53ed3f4.tar.bz2 rails-80573a099e9974173a2f6d9a1ca81c7cc53ed3f4.zip | |
Merge pull request #30564 from tgxworld/fix_incorrect_memoization
PERF: Incorrect memoization in `ActiveRecord::Associations::Preloader…
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index 7bfb85fb32..9bb6a613e1 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -72,7 +72,11 @@ module ActiveRecord end def key_conversion_required? - @key_conversion_required ||= association_key_type != owner_key_type + unless defined?(@key_conversion_required) + @key_conversion_required = (association_key_type != owner_key_type) + end + + @key_conversion_required end def convert_key(key) |