Merge pull request #1764 from stevehodgkiss/master

Fix inconsistencies with serving images in production mode when ActiveRecord is loaded

4 files changed, 34 insertions, 0 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index dd1d2d4fba..090f6bc6fe 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -426,6 +426,14 @@ module ActiveRecord
           @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
diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb
index 4e61671473..e485901440 100644
--- a/activerecord/lib/active_record/query_cache.rb
+++ b/activerecord/lib/active_record/query_cache.rb
@@ -33,6 +33,14 @@ module ActiveRecord
         @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
diff --git a/activerecord/test/cases/connection_management_test.rb b/activerecord/test/cases/connection_management_test.rb
index 85871aebdf..a1d1177289 100644
--- a/activerecord/test/cases/connection_management_test.rb
+++ b/activerecord/test/cases/connection_management_test.rb
@@ -77,6 +77,13 @@ module ActiveRecord
         @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
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index a61180cfaf..ad17f6f83a 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -203,3 +203,14 @@ class QueryCacheExpiryTest < ActiveRecord::TestCase
     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
\ No newline at end of file