Make #rollback_db_transaction smarter.

metaskills · metaskills · commit 2d7171dccfc1 · 2011-10-03T16:12:46.000-04:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,8 @@
 
 * 3.1.1 *
 
+* Make #rollback_db_transaction smarter.
+
 * Provide a method to override for the quoted string prefix. Not a config because trumping this method will 
   have drastically bad results. Fixes #124
 
diff --git a/lib/active_record/connection_adapters/sqlserver/database_statements.rb b/lib/active_record/connection_adapters/sqlserver/database_statements.rb
@@ -54,7 +54,7 @@ def commit_db_transaction
         end
 
         def rollback_db_transaction
-          do_execute "ROLLBACK TRANSACTION" rescue nil
+          do_execute "IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION"
         end
 
         def create_savepoint
