Skip to content
This repository
Browse code

Merge pull request #5882 from vijaydev/fix_generated_attribute_build

Fixing the build
  • Loading branch information...
commit e3a3a14ce78ad0319f263b7fc434be1567c6bc52 2 parents 3b0ffb1 + 938464d
Santiago Pastorino authored April 17, 2012
6  railties/lib/rails/generators/generated_attribute.rb
@@ -22,8 +22,10 @@ def parse(column_definition)
22 22
 
23 23
           type, attr_options = *parse_type_and_options(type)
24 24
 
25  
-          references_index = type.in?(%w(references belongs_to)) && UNIQ_INDEX_OPTIONS.include?(has_index) ? {:unique => true} : true
26  
-          attr_options.merge!({:index => references_index}) if references_index
  25
+          if type.in?(%w(references belongs_to))
  26
+            references_index = UNIQ_INDEX_OPTIONS.include?(has_index) ? {:unique => true} : true
  27
+            attr_options.merge!({:index => references_index})
  28
+          end
27 29
 
28 30
           new(name, type, has_index, attr_options)
29 31
         end

0 notes on commit e3a3a14

Please sign in to comment.
Something went wrong with that request. Please try again.