Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions lib/postamt.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def self.hook!
end

ActiveRecord::Base.instance_eval do
class_attribute :default_connection
class_attribute :default_connection, :transaction_connection

# disable Model.establish_connection
def establish_connection(*args)
Expand All @@ -61,7 +61,7 @@ def establish_connection(*args)

# a transaction runs on Postamt.transaction_connection or on the :on option
def transaction(options = {}, &block)
if connection = (options.delete(:on) || Postamt.transaction_connection)
if connection = (options.delete(:on) || transaction_connection || Postamt.transaction_connection)
Postamt.on(connection) { super }
else
super
Expand Down Expand Up @@ -118,11 +118,19 @@ module Relation
# have to monkey patch them.

def delete_all(conditions = nil)
Postamt.on(:master) { super }
if connection = (transaction_connection || Postamt.transaction_connection)
Postamt.on(connection) { super }
else
super
end
end

def update(updates)
Postamt.on(:master) { super }
if connection = (transaction_connection || Postamt.transaction_connection)
Postamt.on(connection) { super }
else
super
end
end
end
end
Expand Down