diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-18 11:18:46 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-18 11:18:46 -0300 |
| commit | a04dedd5634cbb602cf48938cee0ff11c046b4c2 (patch) | |
| tree | 66c51731cc283310362db57503d4952e0a0213bb /activerecord/test/models/person.rb | |
| parent | 0048897a417774f7e5a0c8c9e82fc8684f94ebc1 (diff) | |
| parent | 27de7f150b57a18d4ccdd274f6f8b621b58108c6 (diff) | |
| download | rails-a04dedd5634cbb602cf48938cee0ff11c046b4c2.tar.gz rails-a04dedd5634cbb602cf48938cee0ff11c046b4c2.tar.bz2 rails-a04dedd5634cbb602cf48938cee0ff11c046b4c2.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/base.rb
activerecord/lib/active_record/migration.rb
activerecord/test/cases/helper.rb
Diffstat (limited to 'activerecord/test/models/person.rb')
| -rw-r--r-- | activerecord/test/models/person.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb index ec2f684a6e..57fa6418f1 100644 --- a/activerecord/test/models/person.rb +++ b/activerecord/test/models/person.rb @@ -10,6 +10,7 @@ class Person < ActiveRecord::Base belongs_to :primary_contact, :class_name => 'Person' has_many :agents, :class_name => 'Person', :foreign_key => 'primary_contact_id' + belongs_to :number1_fan, :class_name => 'Person' named_scope :males, :conditions => { :gender => 'M' } named_scope :females, :conditions => { :gender => 'F' } |