Merge remote-tracking branch 'openstreetmap/pull/954'

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

diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb
index 9042823c28ccd22995be969739a7d9cd93f19ad1..89d38456745e8fa9492bc9a0800356f432cc7633 100644 (file)
--- a/config/initializers/abstract_adapter.rb
+++ b/config/initializers/abstract_adapter.rb
@@ -1,10 +1,11 @@
-if defined?(ActionRecord::ConnectionAdaptors::AbstractAdaptor)
+if defined?(ActiveRecord::ConnectionAdaptors::AbstractAdapter)
   module ActiveRecord
     module ConnectionAdapters
       class AbstractAdapter
-      protected
-        alias_method :old_log, :log
-  
+        protected
+
+        alias old_log log
+
         def log(sql, name)
           if block_given?
             old_log(sql, name) do