diff options
| author | Rolf Timmermans <r.timmermans@voormedia.com> | 2011-03-27 17:18:32 +0200 |
|---|---|---|
| committer | Rolf Timmermans <r.timmermans@voormedia.com> | 2011-03-27 17:18:32 +0200 |
| commit | 512057d386075f207d8927a5e0ce3943174d5c78 (patch) | |
| tree | c0b9122469af1e4af74142cc2cad6d560226753c /activerecord/test/models/categorization.rb | |
| parent | d89a7967b5af5c87bbfc268af72287b82541d384 (diff) | |
| parent | a9d27c04abf24dc85be061ff9772d71897af02b1 (diff) | |
| download | rails-512057d386075f207d8927a5e0ce3943174d5c78.tar.gz rails-512057d386075f207d8927a5e0ce3943174d5c78.tar.bz2 rails-512057d386075f207d8927a5e0ce3943174d5c78.zip | |
Merge remote-tracking branch 'upstream/master' into desc_tracker
Diffstat (limited to 'activerecord/test/models/categorization.rb')
| -rw-r--r-- | activerecord/test/models/categorization.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/models/categorization.rb b/activerecord/test/models/categorization.rb index 45f50e4af3..09489b8ea4 100644 --- a/activerecord/test/models/categorization.rb +++ b/activerecord/test/models/categorization.rb @@ -4,6 +4,8 @@ class Categorization < ActiveRecord::Base belongs_to :named_category, :class_name => 'Category', :foreign_key => :named_category_name, :primary_key => :name belongs_to :author + has_many :post_taggings, :through => :author, :source => :taggings + belongs_to :author_using_custom_pk, :class_name => 'Author', :foreign_key => :author_id, :primary_key => :author_address_extra_id has_many :authors_using_custom_pk, :class_name => 'Author', :foreign_key => :id, :primary_key => :category_id end |