diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-05-05 13:01:57 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-05-05 13:01:57 -0700 |
| commit | dcd04e76179611a9db28c9e391aa7d6c2a5b046a (patch) | |
| tree | 381b5abe1547dd94bf216bbe4dd92746eb1c6a24 /activerecord/lib/active_record/associations/join_dependency.rb | |
| parent | 58a49875df63729f07a9a81d1ee349087d258df5 (diff) | |
| parent | 0d8cf53296a4d7c1e6d85c533784a2607bfe3baa (diff) | |
| download | rails-dcd04e76179611a9db28c9e391aa7d6c2a5b046a.tar.gz rails-dcd04e76179611a9db28c9e391aa7d6c2a5b046a.tar.bz2 rails-dcd04e76179611a9db28c9e391aa7d6c2a5b046a.zip | |
Merge pull request #5494 from armstrjare/active_record_relation_keep_association_join_context_on_merge
ActiveRecord::Relation - maintain context of joined associations on merges
Diffstat (limited to 'activerecord/lib/active_record/associations/join_dependency.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/join_dependency.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb index cd366ac8b7..e3d8356f49 100644 --- a/activerecord/lib/active_record/associations/join_dependency.rb +++ b/activerecord/lib/active_record/associations/join_dependency.rb @@ -109,7 +109,7 @@ module ActiveRecord case associations when Symbol, String reflection = parent.reflections[associations.to_s.intern] or - raise ConfigurationError, "Association named '#{ associations }' was not found; perhaps you misspelled it?" + raise ConfigurationError, "Association named '#{ associations }' was not found on #{parent.active_record.name}; perhaps you misspelled it?" unless join_association = find_join_association(reflection, parent) @reflections << reflection join_association = build_join_association(reflection, parent) |