diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-10-31 10:04:56 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-10-31 10:04:56 +0000 |
| commit | d010fb13ef622bdb781e3134005fc849db4c9bea (patch) | |
| tree | 8ca8beb957fb51923938c4e7befa35d44e711dba /activerecord/test/models | |
| parent | fc276e5635821e65c04b8961170cc6bd3c11b923 (diff) | |
| parent | 3cf85fb4fcdae65a4d5a1a5c418492ea0cf9ad6d (diff) | |
| download | rails-d010fb13ef622bdb781e3134005fc849db4c9bea.tar.gz rails-d010fb13ef622bdb781e3134005fc849db4c9bea.tar.bz2 rails-d010fb13ef622bdb781e3134005fc849db4c9bea.zip | |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/lib/active_record/associations/has_many_association.rb
activerecord/lib/active_record/associations/through_association_scope.rb
Diffstat (limited to 'activerecord/test/models')
| -rw-r--r-- | activerecord/test/models/company.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb index be6dd71e3b..ee5f77b613 100644 --- a/activerecord/test/models/company.rb +++ b/activerecord/test/models/company.rb @@ -107,6 +107,7 @@ class Client < Company belongs_to :firm_with_other_name, :class_name => "Firm", :foreign_key => "client_of" belongs_to :firm_with_condition, :class_name => "Firm", :foreign_key => "client_of", :conditions => ["1 = ?", 1] belongs_to :firm_with_primary_key, :class_name => "Firm", :primary_key => "name", :foreign_key => "firm_name" + belongs_to :firm_with_primary_key_symbols, :class_name => "Firm", :primary_key => :name, :foreign_key => :firm_name belongs_to :readonly_firm, :class_name => "Firm", :foreign_key => "firm_id", :readonly => true # Record destruction so we can test whether firm.clients.clear has |