diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-10-18 23:52:07 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-10-18 23:52:07 +0000 |
| commit | 328ef3feaad4c110a7277e3432e9203c7fbbb9e2 (patch) | |
| tree | 30337b862f5752c5a2f76c123abf28d94140bc4c /activerecord/lib/active_record/associations.rb | |
| parent | 311342d8e231f8429e270dce2b1bf4abeb7b4293 (diff) | |
| download | rails-328ef3feaad4c110a7277e3432e9203c7fbbb9e2.tar.gz rails-328ef3feaad4c110a7277e3432e9203c7fbbb9e2.tar.bz2 rails-328ef3feaad4c110a7277e3432e9203c7fbbb9e2.zip | |
Parenthesize :conditions
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -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 cf015f89db..87080bf0da 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -296,8 +296,8 @@ module ActiveRecord options.assert_valid_keys( :foreign_key, :class_name, :exclusively_dependent, :dependent, :conditions, :order, :finder_sql, :counter_sql, - :before_add, :after_add, :before_remove, :after_remove - ) + :before_add, :after_add, :before_remove, :after_remove + ) association_name, association_class_name, association_class_primary_key_name = associate_identification(association_id, options[:class_name], options[:foreign_key]) |