Merge branch 'master' into openstreetbugs

[rails.git] / config / initializers / query_cache.rb

diff --git a/config/initializers/query_cache.rb b/config/initializers/query_cache.rb
index 92372faf3c18762125f9dd8abf2e3e760a566477..bb9c8b0245854243a3a047c887eaf2134696ebb5 100644 (file)
--- a/config/initializers/query_cache.rb
+++ b/config/initializers/query_cache.rb
@@ -1,12 +1 @@
-if defined?(ActionRecord::ConnectionAdaptors::QueryCache)
-  module ActiveRecord
-    module ConnectionAdapters
-      module QueryCache
-        private
-          def cache_sql(sql)
-         yield
-          end
-      end
-    end
-  end
-end
+Rails.configuration.middleware.delete ActiveRecord::QueryCache