aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
index 2d90f1b0cb..32e3c7f5d8 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -163,8 +163,8 @@ module ActiveRecord
else
within_new_transaction(options) { yield }
end
- rescue Exception => error
- raise unless error.is_a?(ActiveRecord::Rollback)
+ rescue ActiveRecord::Rollback
+ # rollbacks are silently swallowed
end
def within_new_transaction(options = {}) #:nodoc: