Skip to content
Browse files

Merge pull request #1768 from stevehodgkiss/3-1-stable

3 1 stable
  • Loading branch information...
2 parents cbd6fa7 + aba7a43 commit 9dca40d4d4bfb18b003fb36a45b366adaba6e73a @josevalim josevalim committed Jun 19, 2011
View
8 activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -426,6 +426,14 @@ def initialize(body, testing = false)
@testing = testing
end
+ def method_missing(method_sym, *arguments, &block)
+ @body.send(method_sym, *arguments, &block)
+ end
+
+ def respond_to?(method_sym, include_private = false)
+ super || @body.respond_to?(method_sym)
+ end
+
def each(&block)
body.each(&block)
end
View
8 activerecord/lib/active_record/query_cache.rb
@@ -33,6 +33,14 @@ def initialize(original_cache_value, target)
@target = target
end
+ def method_missing(method_sym, *arguments, &block)
+ @target.send(method_sym, *arguments, &block)
+ end
+
+ def respond_to?(method_sym, include_private = false)
+ super || @target.respond_to?(method_sym)
+ end
+
def each(&block)
@target.each(&block)
end
View
7 activerecord/test/cases/connection_management_test.rb
@@ -77,6 +77,13 @@ def test_connections_not_closed_if_exception_and_test
@management.call(@env)
assert ActiveRecord::Base.connection_handler.active_connections?
end
+
+ test "proxy is polite to it's body and responds to it" do
+ body = Class.new(String) { def to_path; "/path"; end }.new
+ proxy = ConnectionManagement::Proxy.new(body)
+ assert proxy.respond_to?(:to_path)
+ assert_equal proxy.to_path, "/path"
+ end
end
end
end
View
11 activerecord/test/cases/query_cache_test.rb
@@ -203,3 +203,14 @@ def test_cache_is_expired_by_habtm_delete
end
end
end
+
+class QueryCacheBodyProxyTest < ActiveRecord::TestCase
+
+ test "is polite to it's body and responds to it" do
+ body = Class.new(String) { def to_path; "/path"; end }.new
+ proxy = ActiveRecord::QueryCache::BodyProxy.new(nil, body)
+ assert proxy.respond_to?(:to_path)
+ assert_equal proxy.to_path, "/path"
+ end
+
+end

0 comments on commit 9dca40d

Please sign in to comment.
Something went wrong with that request. Please try again.