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

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

diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb
index 7b22a3cc6ccbd95cf5deda3203de5bbb87985d05..89d38456745e8fa9492bc9a0800356f432cc7633 100644 (file)
--- a/config/initializers/abstract_adapter.rb
+++ b/config/initializers/abstract_adapter.rb
@@ -1,22 +1,27 @@
-module ActiveRecord
-  module ConnectionAdapters
-    class AbstractAdapter
-    protected
-      alias_method :old_log, :log
+if defined?(ActiveRecord::ConnectionAdaptors::AbstractAdapter)
+  module ActiveRecord
+    module ConnectionAdapters
+      class AbstractAdapter
+        protected
 
-      def log(sql, name)
-        if block_given?
-          old_log(sql, name) do
-            yield
+        alias old_log log
+
+        def log(sql, name)
+          if block_given?
+            old_log(sql, name) do
+              yield
+            end
+          else
+            old_log(sql, name)
+          end
+        rescue ActiveRecord::StatementInvalid => ex
+          if ex.message =~ /^OSM::APITimeoutError: /
+            raise OSM::APITimeoutError.new
+          elsif ex.message =~ /^Timeout::Error: /
+            raise Timeout::Error.new("time's up!")
+          else
+            raise
           end
-        else
-          old_log(sql, name)
-        end
-      rescue ActiveRecord::StatementInvalid => ex
-        if ex =~ /^OSM::APITimeoutError: /
-          raise OSM::APITimeoutError
-        else
-          raise
         end
       end
     end