diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-28 23:17:07 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-28 23:17:07 +0530 |
| commit | 955a72c692a4298d238cc2e6353b9874099203f1 (patch) | |
| tree | 2a05fecd15526cd0013c22e45825be1aca4844d9 /activerecord/lib/active_record/model.rb | |
| parent | 77fbe1c0199567486c422fdf5cce49f2c11fc953 (diff) | |
| parent | cf3e760b87c49470c9a26ab3e2da67602474be1f (diff) | |
| download | rails-955a72c692a4298d238cc2e6353b9874099203f1.tar.gz rails-955a72c692a4298d238cc2e6353b9874099203f1.tar.bz2 rails-955a72c692a4298d238cc2e6353b9874099203f1.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionpack/lib/action_view/helpers/asset_tag_helper.rb
Diffstat (limited to 'activerecord/lib/active_record/model.rb')
| -rw-r--r-- | activerecord/lib/active_record/model.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/model.rb b/activerecord/lib/active_record/model.rb index 16d9d404e3..f059840f4d 100644 --- a/activerecord/lib/active_record/model.rb +++ b/activerecord/lib/active_record/model.rb @@ -108,12 +108,9 @@ module ActiveRecord # The default inheritance column name is +type+, which means it's a # reserved word inside Active Record. To be able to use single-table # inheritance with another column name, or to use the column +type+ in - # your own model for something else, you can override this method to - # return a different name: + # your own model for something else, you can set +inheritance_column+: # - # def self.inheritance_column - # 'zoink' - # end + # self.inheritance_column = 'zoink' def inheritance_column 'type' end |