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

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

diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb
index f9b711f6ce0f6387efea1dfc8e5e923b21a3aaf6..89d38456745e8fa9492bc9a0800356f432cc7633 100644 (file)
--- a/config/initializers/abstract_adapter.rb
+++ b/config/initializers/abstract_adapter.rb
@@ -2,9 +2,10 @@ 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