diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2019-02-26 01:15:08 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 01:15:08 +0900 |
| commit | 7d44d2a4edce4b39a232f83755e38ce1a5279074 (patch) | |
| tree | 10034e7ef5dc6b698689f84ce8f65f91dfcc0f5f /activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb | |
| parent | f4bef91a312954535c37f727c1bdbffaed64c2c1 (diff) | |
| parent | 66b4ddd3353e14b27214e156c949ba41e2ce5ba4 (diff) | |
| download | rails-7d44d2a4edce4b39a232f83755e38ce1a5279074.tar.gz rails-7d44d2a4edce4b39a232f83755e38ce1a5279074.tar.bz2 rails-7d44d2a4edce4b39a232f83755e38ce1a5279074.zip | |
Merge pull request #35399 from kamipo/fix_prepared_statement_caching
Fix prepared statements caching to be enabled even when query caching is enabled
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb index d950099bab..93b1c4e632 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb @@ -97,9 +97,8 @@ module ActiveRecord arel = arel_from_relation(arel) sql, binds = to_sql_and_binds(arel, binds) - if binds.length > bind_params_length - sql, binds = unprepared_statement { to_sql_and_binds(arel) } - preparable = false + if preparable.nil? + preparable = prepared_statements ? visitor.preparable : false end cache_sql(sql, name, binds) { super(sql, name, binds, preparable: preparable) } |