Permalink
Browse files

Merge branch 'master' of git@github.com:rails/rails

  • Loading branch information...
2 parents e466ae1 + fc215de commit c50667e96167efefb0aab4d99f3c04149e87bf6f @dhh dhh committed Oct 31, 2008
View
1 actionpack/lib/action_controller/base.rb
@@ -933,6 +933,7 @@ def render(options = nil, extra_options = {}, &block) #:doc:
def render_to_string(options = nil, &block) #:doc:
render(options, &block)
ensure
+ response.content_type = nil
erase_render_results
reset_variables_added_to_assigns
end
View
10 actionpack/test/controller/render_test.rb
@@ -154,6 +154,10 @@ def render_symbol_json
render :json => {:hello => 'world'}.to_json
end
+ def render_json_with_render_to_string
+ render :json => {:hello => render_to_string(:partial => 'partial')}
+ end
+
def render_custom_code
render :text => "hello world", :status => 404
end
@@ -772,6 +776,12 @@ def test_render_symbol_json
assert_equal 'application/json', @response.content_type
end
+ def test_render_json_with_render_to_string
+ get :render_json_with_render_to_string
+ assert_equal '{"hello": "partial html"}', @response.body
+ assert_equal 'application/json', @response.content_type
+ end
+
def test_render_custom_code
get :render_custom_code
assert_response 404
View
42 activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
@@ -15,7 +15,7 @@ def dirties_query_cache(base, *method_names)
method_names.each do |method_name|
base.class_eval <<-end_code, __FILE__, __LINE__
def #{method_name}_with_query_dirty(*args)
- clear_query_cache if query_cache_enabled
+ clear_query_cache if @query_cache_enabled
#{method_name}_without_query_dirty(*args)
end
@@ -25,38 +25,24 @@ def #{method_name}_with_query_dirty(*args)
end
end
- def query_cache_enabled
- Thread.current['query_cache_enabled']
- end
-
- def query_cache_enabled=(flag)
- Thread.current['query_cache_enabled'] = flag
- end
-
- def query_cache
- Thread.current['query_cache']
- end
-
- def query_cache=(cache)
- Thread.current['query_cache'] = cache
- end
+ attr_reader :query_cache, :query_cache_enabled
# Enable the query cache within the block.
def cache
- old, self.query_cache_enabled = query_cache_enabled, true
- self.query_cache ||= {}
+ old, @query_cache_enabled = @query_cache_enabled, true
+ @query_cache ||= {}
yield
ensure
clear_query_cache
- self.query_cache_enabled = old
+ @query_cache_enabled = old
end
# Disable the query cache within the block.
def uncached
- old, self.query_cache_enabled = query_cache_enabled, false
+ old, @query_cache_enabled = @query_cache_enabled, false
yield
ensure
- self.query_cache_enabled = old
+ @query_cache_enabled = old
end
# Clears the query cache.
@@ -66,20 +52,20 @@ def uncached
# the same SQL query and repeatedly return the same result each time, silently
# undermining the randomness you were expecting.
def clear_query_cache
- query_cache.clear if query_cache
+ @query_cache.clear if @query_cache
end
def select_all_with_query_cache(*args)
- if query_cache_enabled
+ if @query_cache_enabled
cache_sql(args.first) { select_all_without_query_cache(*args) }
else
select_all_without_query_cache(*args)
end
end
def columns_with_query_cache(*args)
- if query_cache_enabled
- query_cache["SHOW FIELDS FROM #{args.first}"] ||= columns_without_query_cache(*args)
+ if @query_cache_enabled
+ @query_cache["SHOW FIELDS FROM #{args.first}"] ||= columns_without_query_cache(*args)
else
columns_without_query_cache(*args)
end
@@ -88,11 +74,11 @@ def columns_with_query_cache(*args)
private
def cache_sql(sql)
result =
- if query_cache.has_key?(sql)
+ if @query_cache.has_key?(sql)
log_info(sql, "CACHE", 0.0)
- query_cache[sql]
+ @query_cache[sql]
else
- query_cache[sql] = yield
+ @query_cache[sql] = yield
end
if Array === result

0 comments on commit c50667e

Please sign in to comment.