From 3b0ffb1efd9d70bf89571d720d994425ba428419 Mon Sep 17 00:00:00 2001 From: Vijay Dev Date: Wed, 18 Apr 2012 00:36:58 +0530 Subject: let's not use `and` in place of `&&` --- railties/lib/rails/generators/generated_attribute.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb index 7296068f04..21167359cc 100644 --- a/railties/lib/rails/generators/generated_attribute.rb +++ b/railties/lib/rails/generators/generated_attribute.rb @@ -22,7 +22,7 @@ module Rails type, attr_options = *parse_type_and_options(type) - references_index = (type.in?(%w(references belongs_to)) and UNIQ_INDEX_OPTIONS.include?(has_index) ? {:unique => true} : true) + 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 new(name, type, has_index, attr_options) -- cgit v1.2.3