diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-11 00:24:19 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-11 00:24:19 +0000 |
| commit | 79365a0184c58def99aff4c4b213048a25179f6a (patch) | |
| tree | 2a33951d6e17d9a2869da4aa6eb728a71092ff5a /activerecord/lib/active_record | |
| parent | bcb81167960293596d44587ea237ace4d505b960 (diff) | |
| download | rails-79365a0184c58def99aff4c4b213048a25179f6a.tar.gz rails-79365a0184c58def99aff4c4b213048a25179f6a.tar.bz2 rails-79365a0184c58def99aff4c4b213048a25179f6a.zip | |
Fixed that foreign keys named the same as the association would cause stack overflow #437 [Eric Anderson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@382 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 742491ae48..e7e5a7d71d 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -336,8 +336,8 @@ module ActiveRecord end_eval else association_finder = options[:conditions] ? - "#{association_class_name}.find_on_conditions(#{association_class_primary_key_name}, \"#{options[:conditions]}\")" : - "#{association_class_name}.find(#{association_class_primary_key_name})" + "#{association_class_name}.find_on_conditions(read_attribute(\"#{association_class_primary_key_name}\"), \"#{options[:conditions]}\")" : + "#{association_class_name}.find(read_attribute(\"#{association_class_primary_key_name}\"))" end has_association_method(association_name) |