aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/core.rb
diff options
context:
space:
mode:
authorErnie Miller <ernie@erniemiller.org>2012-08-19 08:02:09 -0400
committerErnie Miller <ernie@erniemiller.org>2012-08-19 08:06:31 -0400
commitbf80522be4d7ac521fa3c30d889afa68450a0bc2 (patch)
tree687385bd46b8a6d0761ea35fc82e9e6417c5eccb /activerecord/lib/active_record/core.rb
parentf9fc26e8007d5e2936cf5374a8168b2c37273490 (diff)
downloadrails-bf80522be4d7ac521fa3c30d889afa68450a0bc2.tar.gz
rails-bf80522be4d7ac521fa3c30d889afa68450a0bc2.tar.bz2
rails-bf80522be4d7ac521fa3c30d889afa68450a0bc2.zip
Fix "last equality wins" logic in relation merge
This is a real fix (as compared to the band-aid in b127d86c), which uses the recently-added equality methods for ARel nodes. It has the side benefit of simplifying the merge code a bit.
Diffstat (limited to 'activerecord/lib/active_record/core.rb')
0 files changed, 0 insertions, 0 deletions