github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve the error message for class mismatch on Relation#merge

Browse Source
This commit is contained in:
Pratik Naik
2010-01-17 02:08:42 +05:30
parent 7f8d4d3c4e
commit 468cfcedd3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
activerecord/lib/active_record/relation/spawn_methods.rb
View File

@@ -15,7 +15,9 @@ module ActiveRecord
end
def merge(r)
raise ArgumentError, "Cannot merge a #{r.klass.name} relation with #{@klass.name} relation" if r.klass != @klass
if r.klass != @klass
raise ArgumentError, "Cannot merge a #{r.klass.name}(##{r.klass.object_id}) relation with #{@klass.name}(##{@klass.object_id}) relation"
end
merged_relation = spawn.eager_load(r.eager_load_values).preload(r.preload_values).includes(r.includes_values)