diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-12-20 11:23:07 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2010-12-20 11:23:07 -0300 |
| commit | 02fc6fbccdd3345e95592cc14e7855e2f1ea14b3 (patch) | |
| tree | b26b91e2b2fad62ec382c9cee4ca2ac318f09257 /activerecord/test/models/categorization.rb | |
| parent | 2ba06b48defaca940e7c878724e2fb1c090eaa92 (diff) | |
| parent | 0cbfd6c28d327304432f7d0c067662b5c1e41a78 (diff) | |
| download | rails-02fc6fbccdd3345e95592cc14e7855e2f1ea14b3.tar.gz rails-02fc6fbccdd3345e95592cc14e7855e2f1ea14b3.tar.bz2 rails-02fc6fbccdd3345e95592cc14e7855e2f1ea14b3.zip | |
Merge remote branch 'rails/master' into identity_map
Conflicts:
activerecord/lib/active_record/associations/association_proxy.rb
activerecord/lib/active_record/autosave_association.rb
activerecord/lib/active_record/base.rb
activerecord/lib/active_record/persistence.rb
Diffstat (limited to 'activerecord/test/models/categorization.rb')
| -rw-r--r-- | activerecord/test/models/categorization.rb | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/activerecord/test/models/categorization.rb b/activerecord/test/models/categorization.rb index 10594323ff..fdb0a11540 100644 --- a/activerecord/test/models/categorization.rb +++ b/activerecord/test/models/categorization.rb @@ -2,4 +2,16 @@ class Categorization < ActiveRecord::Base belongs_to :post belongs_to :category belongs_to :author -end
\ No newline at end of file + + 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 + +class SpecialCategorization < ActiveRecord::Base + self.table_name = 'categorizations' + + default_scope where(:special => true) + + belongs_to :author + belongs_to :category +end |