--- /dev/null
+module ActiveRecord
+ module ConnectionAdapters
+ class AbstractAdapter
+ protected
+ alias_method :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 =~ /^OSM::APITimeoutError: /
+ raise OSM::APITimeoutError
+ else
+ raise
+ end
+ end
+ end
+ end
+end