diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-18 14:49:02 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-18 14:49:02 -0800 |
commit | 248391a7e11e9fa5ffe312cb380034691430acc5 (patch) | |
tree | 0d151f54139732c417f3d4242e13f1aac64ac858 /activerecord/test/models | |
parent | 86abd6887dac9ee233740399f9e5758309af512e (diff) | |
parent | a9422cc1db9501a80ecf2c25a5d3b0c4f4f32763 (diff) | |
download | rails-248391a7e11e9fa5ffe312cb380034691430acc5.tar.gz rails-248391a7e11e9fa5ffe312cb380034691430acc5.tar.bz2 rails-248391a7e11e9fa5ffe312cb380034691430acc5.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/test/models')
-rw-r--r-- | activerecord/test/models/member.rb | 1 | ||||
-rw-r--r-- | activerecord/test/models/member_detail.rb | 1 | ||||
-rw-r--r-- | activerecord/test/models/member_type.rb | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/test/models/member.rb b/activerecord/test/models/member.rb index 77a37abb38..255fb569d7 100644 --- a/activerecord/test/models/member.rb +++ b/activerecord/test/models/member.rb @@ -8,4 +8,5 @@ class Member < ActiveRecord::Base has_one :sponsor_club, :through => :sponsor has_one :member_detail has_one :organization, :through => :member_detail + belongs_to :member_type end
\ No newline at end of file diff --git a/activerecord/test/models/member_detail.rb b/activerecord/test/models/member_detail.rb index e731454556..94f59e5794 100644 --- a/activerecord/test/models/member_detail.rb +++ b/activerecord/test/models/member_detail.rb @@ -1,4 +1,5 @@ class MemberDetail < ActiveRecord::Base belongs_to :member belongs_to :organization + has_one :member_type, :through => :member end diff --git a/activerecord/test/models/member_type.rb b/activerecord/test/models/member_type.rb new file mode 100644 index 0000000000..a13561c72a --- /dev/null +++ b/activerecord/test/models/member_type.rb @@ -0,0 +1,3 @@ +class MemberType < ActiveRecord::Base + has_many :members +end |