Merge remote-tracking branch 'upstream/pull/5146'

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

diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb
index 290e2493d943c26470eb54d6e2a2b49f28041b5d..9d59656c7b2cd4255d019c523bf57952249e0648 100644 (file)
--- a/config/initializers/abstract_adapter.rb
+++ b/config/initializers/abstract_adapter.rb
@@ -1,17 +1,17 @@
 if defined?(ActiveRecord::ConnectionAdaptors::AbstractAdapter)
 if defined?(ActiveRecord::ConnectionAdaptors::AbstractAdapter)

-  module OSM
+  module OpenStreetMap

     module AbstractAdapter
       module PropagateTimeouts
         def translate_exception_class(e, sql)
           if e.is_a?(Timeout::Error) || e.is_a?(OSM::APITimeoutError)
             e
           else
     module AbstractAdapter
       module PropagateTimeouts
         def translate_exception_class(e, sql)
           if e.is_a?(Timeout::Error) || e.is_a?(OSM::APITimeoutError)
             e
           else

-            super(e, sql)
+            super

           end
         end
       end
     end
   end
 
           end
         end
       end
     end
   end
 

-  ActiveRecord::ConnectionAdaptors::AbstractAdapter.prepend(OSM::AbstractAdapter::PropagateTimeouts)
+  ActiveRecord::ConnectionAdaptors::AbstractAdapter.prepend(OpenStreetMap::AbstractAdapter::PropagateTimeouts)

 end
 end