diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2019-03-01 22:45:57 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-01 22:45:57 +0900 |
| commit | c82705b15faaf12d568272e86afb6ad2c151007f (patch) | |
| tree | 69edd7eb0182cb40f42be34fc7b45c71d97bd288 /activerecord/lib | |
| parent | 0c4bf982e80414a5437f18f988b63885359326e7 (diff) | |
| parent | dda5501e80cb98bbe119ac2f9fcf9b7049e121ce (diff) | |
| download | rails-c82705b15faaf12d568272e86afb6ad2c151007f.tar.gz rails-c82705b15faaf12d568272e86afb6ad2c151007f.tar.bz2 rails-c82705b15faaf12d568272e86afb6ad2c151007f.zip | |
Merge pull request #35431 from kamipo/enable_sql_cache_on_find
Enable SQL statement cache for `find` on base class as with `find_by`
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index 18cfac1f2f..eb4b48bc37 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -161,7 +161,7 @@ module ActiveRecord return super if block_given? || primary_key.nil? || scope_attributes? || - columns_hash.include?(inheritance_column) + columns_hash.key?(inheritance_column) && !base_class? id = ids.first |