diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-08-18 13:57:52 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-18 13:57:52 +0900 |
| commit | 893ccb3d37c64b28c27c0f7a5790a69c6dc159ba (patch) | |
| tree | 47882f3734c96af4c5828e902307a5825bf1d01f /activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb | |
| parent | e9ba12f746b3d149bba252df84957a9c26ad170b (diff) | |
| download | rails-893ccb3d37c64b28c27c0f7a5790a69c6dc159ba.tar.gz rails-893ccb3d37c64b28c27c0f7a5790a69c6dc159ba.tar.bz2 rails-893ccb3d37c64b28c27c0f7a5790a69c6dc159ba.zip | |
Restore `to_sql` to return only SQL (#29945)
Because `to_sql` is public API. I introduced `to_sql_and_binds` internal
API to return SQL and binds.
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 | 2 |
1 files changed, 1 insertions, 1 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 41d93c4322..25622e34c8 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb @@ -95,7 +95,7 @@ module ActiveRecord def select_all(arel, name = nil, binds = [], preparable: nil) if @query_cache_enabled && !locked?(arel) arel = arel_from_relation(arel) - sql, binds = to_sql(arel, binds) + sql, binds = to_sql_and_binds(arel, binds) cache_sql(sql, name, binds) { super(sql, name, binds, preparable: preparable) } else super |