Move transaction joinability into the transaction object

1 files changed, 8 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
index f456ecae66..1d0b3eb612 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
@@ -25,13 +25,20 @@ module ActiveRecord
         false
       end
 
+      def joinable?
+        false
+      end
+
       # This is a noop when there are no open transactions
       def add_record(record)
       end
     end
 
     class OpenTransaction < Transaction #:nodoc:
-      attr_reader :parent, :records
+      attr_reader   :parent, :records
+      attr_accessor :joinable
+
+      alias joinable? joinable
 
       def initialize(connection, parent)
         super connection