Merge pull request #7605 from revans/master

Add docs to inheritance_column method, explaining how to override it
to be able to use the "type" column without STI [ci skip]

1 files changed, 11 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/model.rb b/activerecord/lib/active_record/model.rb
index 57553c29eb..44cde49bd5 100644
--- a/activerecord/lib/active_record/model.rb
+++ b/activerecord/lib/active_record/model.rb
@@ -101,9 +101,19 @@ module ActiveRecord
       def abstract_class?
         false
       end
-      
+
       # Defines the name of the table column which will store the class name on single-table
       # inheritance situations.
+      #
+      # 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:
+      #
+      #   def self.inheritance_column
+      #     'zoink'
+      #   end
       def inheritance_column
         'type'
       end