diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-12-24 01:55:35 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-12-24 01:55:35 +0100 |
| commit | 8cdb75808198bf579e14d0fcdd1d2a51b3233add (patch) | |
| tree | 9bf4bb54e4175bc805d407e2b5e3bc42bf1d0dd8 /activerecord/test/models/categorization.rb | |
| parent | 3822673151cd0f53e0e4e671988e35603bf2901c (diff) | |
| parent | 6974c595fd480dc0ae3311ef60920fa87c5ff9d0 (diff) | |
| download | rails-8cdb75808198bf579e14d0fcdd1d2a51b3233add.tar.gz rails-8cdb75808198bf579e14d0fcdd1d2a51b3233add.tar.bz2 rails-8cdb75808198bf579e14d0fcdd1d2a51b3233add.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activerecord/test/models/categorization.rb')
| -rw-r--r-- | activerecord/test/models/categorization.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/models/categorization.rb b/activerecord/test/models/categorization.rb index fdb0a11540..45f50e4af3 100644 --- a/activerecord/test/models/categorization.rb +++ b/activerecord/test/models/categorization.rb @@ -1,6 +1,7 @@ class Categorization < ActiveRecord::Base belongs_to :post belongs_to :category + belongs_to :named_category, :class_name => 'Category', :foreign_key => :named_category_name, :primary_key => :name belongs_to :author belongs_to :author_using_custom_pk, :class_name => 'Author', :foreign_key => :author_id, :primary_key => :author_address_extra_id |