|
@@ -84,6 +84,8 @@ module Blazer
|
|
|
connection_model.connection.execute("SET statement_timeout = #{timeout.to_i * 1000}")
|
|
|
elsif mysql?
|
|
|
connection_model.connection.execute("SET max_execution_time = #{timeout.to_i * 1000}")
|
|
|
+ else
|
|
|
+ raise Blazer::TimeoutNotSupported, "Timeout not supported for #{adapter_name} adapter"
|
|
|
end
|
|
|
end
|
|
|
|
|
@@ -146,11 +148,8 @@ module Blazer
|
|
|
def in_transaction
|
|
|
if use_transaction?
|
|
|
connection_model.transaction do
|
|
|
- begin
|
|
|
- yield
|
|
|
- ensure
|
|
|
- raise ActiveRecord::Rollback
|
|
|
- end
|
|
|
+ yield
|
|
|
+ raise ActiveRecord::Rollback
|
|
|
end
|
|
|
else
|
|
|
yield
|