Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.
Closed
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
14 changes: 9 additions & 5 deletions lib/replicate/active_record.rb
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,11 @@ def replicate_find_existing_record(attributes)
replicate_natural_key.each do |attribute_name|
conditions[attribute_name] = attributes[attribute_name.to_s]
end
find(:first, :conditions => conditions)
if ::ActiveRecord::VERSION::MAJOR >= 4
where(conditions).first
else
find(:first, :conditions => conditions)
end
end

# Update an AR object's attributes and persist to the database without
Expand Down Expand Up @@ -303,10 +307,10 @@ def replicate_disable_callbacks(instance)
def instance.run_callbacks(*args); yield if block_given?; end

# AR 3.0.x
def instance._run_save_callbacks(*args); yield; end
def instance._run_create_callbacks(*args); yield; end
def instance._run_update_callbacks(*args); yield; end
def instance._run_commit_callbacks(*args); yield; end
def instance._run_save_callbacks(*args); yield if block_given?; end
def instance._run_create_callbacks(*args); yield if block_given?; end
def instance._run_update_callbacks(*args); yield if block_given?; end
def instance._run_commit_callbacks(*args); yield if block_given?; end
else
# AR 2.x
def instance.callback(*args)
Expand Down