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

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

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

-  module OSM
+  module OpenStreetMap

     module AbstractAdapter
       module PropagateTimeouts
         def translate_exception_class(e, sql)
     module AbstractAdapter
       module PropagateTimeouts
         def translate_exception_class(e, sql)


@@ -13,5 +13,5 @@ if defined?(ActiveRecord::ConnectionAdaptors::AbstractAdapter)
     end
   end
 
     end
   end
 

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

 end
 end