From 938464d475877377bb84512930f0a96953f63f57 Mon Sep 17 00:00:00 2001 From: Vijay Dev Date: Wed, 18 Apr 2012 02:16:44 +0530 Subject: [PATCH] the index option is always created if the type is one of references or belongs_to. Refactoring it to a simpler form and fixing the build --- railties/lib/rails/generators/generated_attribute.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb index 21167359cc..50e7aa85ac 100644 --- a/railties/lib/rails/generators/generated_attribute.rb +++ b/railties/lib/rails/generators/generated_attribute.rb @@ -22,8 +22,10 @@ module Rails type, attr_options = *parse_type_and_options(type) - references_index = type.in?(%w(references belongs_to)) && UNIQ_INDEX_OPTIONS.include?(has_index) ? {:unique => true} : true - attr_options.merge!({:index => references_index}) if references_index + if type.in?(%w(references belongs_to)) + references_index = UNIQ_INDEX_OPTIONS.include?(has_index) ? {:unique => true} : true + attr_options.merge!({:index => references_index}) + end new(name, type, has_index, attr_options) end