1 files changed, 20 insertions, 8 deletions
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index 61479b9068..25d0161e4c 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -1,10 +1,11 @@
 require 'active_support/time'
-require 'active_support/core_ext/object/inclusion'
-require 'active_support/core_ext/object/blank'
 
 module Rails
   module Generators
     class GeneratedAttribute
+      INDEX_OPTIONS = %w(index uniq)
+      UNIQ_INDEX_OPTIONS = %w(uniq)
+
       attr_accessor :name, :type
       attr_reader   :attr_options
 
@@ -15,12 +16,23 @@ module Rails
           # if user provided "name:index" instead of "name:string:index"
           # type should be set blank so GeneratedAttribute's constructor
           # could set it to :string
-          has_index, type = type, nil if %w(index uniq).include?(type)
+          has_index, type = type, nil if INDEX_OPTIONS.include?(type)
 
           type, attr_options = *parse_type_and_options(type)
+          type = type.to_sym if type
+
+          if type && reference?(type)
+            references_index = UNIQ_INDEX_OPTIONS.include?(has_index) ? { :unique => true } : true
+            attr_options[:index] = references_index
+          end
+
           new(name, type, has_index, attr_options)
         end
 
+        def reference?(type)
+          [:references, :belongs_to].include? type
+        end
+
         private
 
         # parse possible attribute options like :limit for string/text/binary/integer or :precision/:scale for decimals
@@ -29,7 +41,7 @@ module Rails
           case type
           when /(string|text|binary|integer)\{(\d+)\}/
             return $1, :limit => $2.to_i
-          when /decimal\{(\d+),(\d+)\}/
+          when /decimal\{(\d+)[,.-](\d+)\}/
             return :decimal, :precision => $1.to_i, :scale => $2.to_i
           else
             return type, {}
@@ -39,9 +51,9 @@ module Rails
 
       def initialize(name, type=nil, index_type=false, attr_options={})
         @name           = name
-        @type           = (type.presence || :string).to_sym
-        @has_index      = %w(index uniq).include?(index_type)
-        @has_uniq_index = %w(uniq).include?(index_type)
+        @type           = type || :string
+        @has_index      = INDEX_OPTIONS.include?(index_type)
+        @has_uniq_index = UNIQ_INDEX_OPTIONS.include?(index_type)
         @attr_options   = attr_options
       end
 
@@ -84,7 +96,7 @@ module Rails
       end
 
       def reference?
-        self.type.in?([:references, :belongs_to])
+        self.class.reference?(type)
       end
 
       def has_index?