kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Revert "Performance: freeze cached rows instead of duping"

Browse source 
This reverts commit cd8e653d5b.
This commit is contained in:
Jeremy Kemper 2008-08-21 21:40:49 -07:00
parent a5eb297424
commit 6e3d2a7996
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/base.rb
View file

@ -612,7 +612,7 @@ module ActiveRecord #:nodoc:
# Post.find_by_sql ["SELECT title FROM posts WHERE author = ? AND created > ?", author_id, start_date]
# > [#<Post:0x36bff9c @attributes={"first_name"=>"The Cheap Man Buys Twice"}>, ...]
def find_by_sql(sql)
connection.select_all(sanitize_sql(sql), "#{name} Load").map { |record| instantiate(record) }
connection.select_all(sanitize_sql(sql), "#{name} Load").collect! { |record| instantiate(record) }
end
# Checks whether a record exists in the database that matches conditions given. These conditions

17
activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
View file

@ -72,12 +72,21 @@ module ActiveRecord
private
def cache_sql(sql)
if @query_cache.has_key?(sql)
log_info(sql, "CACHE", 0.0)
@query_cache[sql]
result =
if @query_cache.has_key?(sql)
log_info(sql, "CACHE", 0.0)
@query_cache[sql]
else
@query_cache[sql] = yield
end
if Array === result
result.collect { |row| row.dup }
else
@query_cache[sql] = yield.freeze
result.duplicable? ? result.dup : result
end
rescue TypeError
result
end
end
end