github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-25 22:38:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

better error message for missing associations #1631 [courtenay]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1787 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2005-07-09 17:14:14 +00:00
parent 1d7aa9fe81
commit 14762fd229
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
activerecord/lib/active_record/associations.rb
View File

@@ -739,13 +739,20 @@ module ActiveRecord
end
def find_with_associations(options = {})
reflections = reflect_on_included_associations(options[:include])
reflections = reflect_on_included_associations(options[:include])
reflections.each do |r|
raise(
NoMethodError,
"Association was not found; perhaps you misspelled it? You specified :include=>:#{options[:include].join(', :')}"
) if r.nil?
end
schema_abbreviations = generate_schema_abbreviations(reflections)
primary_key_table = generate_primary_key_table(reflections, schema_abbreviations)
rows = select_all_rows(options, schema_abbreviations, reflections)
records, records_in_order = { }, []
primary_key = primary_key_table[table_name]
rows = select_all_rows(options, schema_abbreviations, reflections)
records, records_in_order = { }, []
primary_key = primary_key_table[table_name]
for row in rows
id = row[primary_key]

12
activerecord/test/associations_go_eager_test.rb
View File

@@ -92,5 +92,17 @@ class EagerAssociationTest < Test::Unit::TestCase
:conditions => ["companies.name = ?", "37signals"])
assert_not_nil companies(:first_firm, :reload).account
end
def test_eager_with_invalid_association_reference
assert_raises(NoMethodError, "Association was not found; perhaps you misspelled it? You specified :include=>:monkeys") {
post = Post.find(6, :include=>[ :monkeys ])
}
assert_raises(NoMethodError, "Association was not found; perhaps you misspelled it? You specified :include=>:monkeys, :elephants") {
post = Post.find(6, :include=>[ :monkeys, :elephants ])
}
end
end