Permalink
Browse files

Remove parent on Transaction object

  • Loading branch information...
1 parent 91e4b65 commit dac9c92e3096ae196d7ea4b58e7141f4a36007ea @arthurnn arthurnn committed Jul 28, 2014
Showing with 9 additions and 16 deletions.
  1. +9 −16 activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
@@ -8,7 +8,7 @@ def initialize(connection)
def begin_transaction(options = {})
transaction_class = @stack.empty? ? RealTransaction : SavepointTransaction
- transaction = transaction_class.new(@connection, current_transaction, "active_record_#{@stack.size}", options)
+ transaction = transaction_class.new(@connection, "active_record_#{@stack.size}", options)
@stack.push(transaction)
transaction
@@ -55,17 +55,13 @@ def closed_transaction
end
class Transaction #:nodoc:
- attr_reader :connection
+ attr_reader :connection, :state
def initialize(connection)
@connection = connection
@state = TransactionState.new
end
- def state
- @state
- end
-
def savepoint_name
nil
end
@@ -120,13 +116,12 @@ def add_record(record)
end
class OpenTransaction < Transaction #:nodoc:
- attr_reader :parent, :records
+ attr_reader :records
attr_writer :joinable
- def initialize(connection, parent, options = {})
+ def initialize(connection, options = {})
super connection
- @parent = parent
@records = []
@joinable = options.fetch(:joinable, true)
end
@@ -138,12 +133,10 @@ def joinable?
def rollback
perform_rollback
- parent
end
def commit
perform_commit
- parent
end
def add_record(record)
@@ -158,7 +151,7 @@ def rollback_records
@state.set_state(:rolledback)
records.uniq.each do |record|
begin
- record.rolledback!(parent.closed?)
+ record.rolledback!(self.is_a?(RealTransaction))
rescue => e
record.logger.error(e) if record.respond_to?(:logger) && record.logger
end
@@ -186,8 +179,8 @@ def open?
end
class RealTransaction < OpenTransaction #:nodoc:
- def initialize(connection, parent, _, options = {})
- super(connection, parent, options)
+ def initialize(connection, _, options = {})
+ super(connection, options)
if options[:isolation]
connection.begin_isolated_db_transaction(options[:isolation])
@@ -210,12 +203,12 @@ def perform_commit
class SavepointTransaction < OpenTransaction #:nodoc:
attr_reader :savepoint_name
- def initialize(connection, parent, savepoint_name, options = {})
+ def initialize(connection, savepoint_name, options = {})
if options[:isolation]
raise ActiveRecord::TransactionIsolationError, "cannot set transaction isolation in a nested transaction"
end
- super(connection, parent, options)
+ super(connection, options)
connection.create_savepoint(@savepoint_name = savepoint_name)
end

0 comments on commit dac9c92

Please sign in to comment.