From 8de3c433ef21d325c9ab3072c75da4b3d9043d8d Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 10 Apr 2014 17:10:09 -0700 Subject: fix ivar names and add reader methods --- activerecord/lib/active_record/statement_cache.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'activerecord/lib/active_record/statement_cache.rb') diff --git a/activerecord/lib/active_record/statement_cache.rb b/activerecord/lib/active_record/statement_cache.rb index df3c293eb1..c6341744ca 100644 --- a/activerecord/lib/active_record/statement_cache.rb +++ b/activerecord/lib/active_record/statement_cache.rb @@ -74,27 +74,26 @@ module ActiveRecord end end + attr_reader :bind_map, :query_builder, :klass + def initialize(block = Proc.new) relation = block.call Params.new - @binds = BindMap.new relation.bind_values + @bind_map = BindMap.new relation.bind_values @klass = relation.klass - @query_builder = query_builder @klass.connection, relation.arel + @query_builder = make_query_builder @klass.connection, relation.arel end def execute(params) - klass = @klass - bind_map = @binds bind_values = bind_map.bind params - builder = @query_builder - sql = builder.sql_for bind_values, klass.connection + sql = query_builder.sql_for bind_values, klass.connection klass.find_by_sql sql, bind_values end alias :call :execute private - def query_builder(connection, arel) + def make_query_builder(connection, arel) connection.cacheable_query(arel) end end -- cgit v1.2.3