From 74bfbfdb028bf4fb97fdf93451caeb49aa89ff39 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 14 Jan 2014 14:26:00 -0800 Subject: fix cache class interface --- activerecord/lib/active_record/statement_cache.rb | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/statement_cache.rb b/activerecord/lib/active_record/statement_cache.rb index dd4ee0c4a0..90d4748d84 100644 --- a/activerecord/lib/active_record/statement_cache.rb +++ b/activerecord/lib/active_record/statement_cache.rb @@ -14,13 +14,25 @@ module ActiveRecord # The relation returned by the block is cached, and for each +execute+ call the cached relation gets duped. # Database is queried when +to_a+ is called on the relation. class StatementCache - def initialize - @relation = yield - raise ArgumentError.new("Statement cannot be nil") if @relation.nil? + def initialize(block = Proc.new) + @mutex = Mutex.new + @relation = nil + @block = block end - def execute - @relation.dup.to_a + def execute(*vals) + rel = relation vals + @mutex.synchronize do + rel.set_binds vals + rel.to_a + end + end + + private + def relation(values) + @relation || @mutex.synchronize { + @block.call(*values) + } end end end -- cgit v1.2.3