Fix #7191. Remove unnecessary transaction when assigning has_one associations. #7286

Merged
merged 1 commit into from Aug 10, 2012

Conversation

Projects
None yet
2 participants
Contributor

kennyj commented Aug 8, 2012

Please see #7191. If target is equal to record or target and record are nil, we should not use transaction.

rafaelfranca added a commit that referenced this pull request Aug 10, 2012

Merge pull request #7286 from kennyj/fix_7191
Fix #7191. Remove unnecessary transaction when assigning has_one associations.

@rafaelfranca rafaelfranca merged commit d1835db into rails:master Aug 10, 2012

rafaelfranca added a commit that referenced this pull request Aug 10, 2012

Merge pull request #7286 from kennyj/fix_7191
Fix #7191. Remove unnecessary transaction when assigning has_one associations.
Conflicts:
	activerecord/test/cases/associations/has_one_associations_test.rb

rafaelfranca added a commit that referenced this pull request Aug 10, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment