diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb index 17d57a7519f4f5a0ad76294e01908f036433bc42..ff7f922d7f678c290cdf2bfb23251f1a88f77b87 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb @@ -50,7 +50,7 @@ def current_transaction private def closed_transaction - @closed_transaction ||= ClosedTransaction.new(@connection) + @closed_transaction ||= ClosedTransaction.new end end @@ -98,21 +98,12 @@ def set_state(state) end class ClosedTransaction < Transaction #:nodoc: - def closed? - true - end - - def open? - false - end - - def joinable? - false - end - + def initialize; super(nil); end + def closed?; true; end + def open?; false; end + def joinable?; false; end # This is a noop when there are no open transactions - def add_record(record) - end + def add_record(record); end end class OpenTransaction < Transaction #:nodoc: @@ -126,7 +117,6 @@ def initialize(connection, options = {}) @joinable = options.fetch(:joinable, true) end - def joinable? @joinable end