Ensuring aliased methods return original values.

packagethief · Dec 15, 2009 · 6fe6463 · 6fe6463
1 parent 0cb5a04
commit 6fe6463
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/after_commit/active_record.rb b/lib/after_commit/active_record.rb
@@ -4,8 +4,9 @@ def self.included(base)
       base.class_eval do
         class << self
           def establish_connection_with_after_commit(spec = nil)
-            establish_connection_without_after_commit spec
+            result = establish_connection_without_after_commit spec
             include_after_commit_extensions
+            result
           end
           alias_method_chain :establish_connection, :after_commit
 

diff --git a/lib/after_commit/connection_adapters.rb b/lib/after_commit/connection_adapters.rb
@@ -10,21 +10,23 @@ def self.included(base)
         def commit_db_transaction_with_callback
           increment_transaction_pointer
           committed = false
+          result    = nil
           begin
             trigger_before_commit_callbacks
             trigger_before_commit_on_create_callbacks
             trigger_before_commit_on_update_callbacks
             trigger_before_commit_on_destroy_callbacks
 
-            commit_db_transaction_without_callback
+            result = commit_db_transaction_without_callback
             committed = true
 
             trigger_after_commit_callbacks
             trigger_after_commit_on_create_callbacks
             trigger_after_commit_on_update_callbacks
             trigger_after_commit_on_destroy_callbacks
+            result
           rescue
-            rollback_db_transaction unless committed
+            committed ? result : rollback_db_transaction
           ensure
             AfterCommit.cleanup(self)
             decrement_transaction_pointer
@@ -37,9 +39,11 @@ def commit_db_transaction_with_callback
         # callback for each record that failed to be committed.
         def rollback_db_transaction_with_callback
           begin
+            result = nil
             trigger_before_rollback_callbacks
-            rollback_db_transaction_without_callback
+            result = rollback_db_transaction_without_callback
             trigger_after_rollback_callbacks
+            result
           ensure
             AfterCommit.cleanup(self)
           end