1 files changed, 11 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index d8a4f15b4b..5e2784c4b0 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -99,13 +99,17 @@ module Rails
       end
 
       def index_name
-        @index_name ||= if reference?
-          polymorphic? ? %w(id type).map { |t| "#{name}_#{t}" } : "#{name}_id"
+        @index_name ||= if polymorphic?
+          %w(id type).map { |t| "#{name}_#{t}" }
         else
-          name
+          column_name
         end
       end
 
+      def column_name
+        @column_name ||= reference? ? "#{name}_id" : name
+      end
+
       def foreign_key?
         !!(name =~ /_id$/)
       end
@@ -126,6 +130,10 @@ module Rails
         @has_uniq_index
       end
 
+      def password_digest?
+        name == 'password' && type == :digest 
+      end
+
       def inject_options
         "".tap { |s| @attr_options.each { |k,v| s << ", #{k}: #{v.inspect}" } }
       end