1 files changed, 11 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index d480fc12b5..d2c2abf40c 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -8,6 +8,7 @@ module Rails
 
       attr_accessor :name, :type
       attr_reader   :attr_options
+      attr_writer   :index_name
 
       class << self
         def parse(column_definition)
@@ -89,18 +90,26 @@ module Rails
         end
       end
 
+      def plural_name
+        name.sub(/_id$/, '').pluralize
+      end
+
       def human_name
-        name.to_s.humanize
+        name.humanize
       end
 
       def index_name
-        if reference?
+        @index_name ||= if reference?
           polymorphic? ? %w(id type).map { |t| "#{name}_#{t}" } : "#{name}_id"
         else
           name
         end
       end
 
+      def foreign_key?
+        !!(name =~ /_id$/)
+      end
+
       def reference?
         self.class.reference?(type)
       end