aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/rails/generators/active_record/model/templates
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-24 10:38:19 +0100
committerJosé Valim <jose.valim@gmail.com>2011-12-24 10:38:19 +0100
commitb4e97ea2d961c7ed99dcfa48044f4922378ff9cf (patch)
tree9aac1ae030dfc9ad9e7cef22e5d05e35011e5af1 /activerecord/lib/rails/generators/active_record/model/templates
parent7a47f362c8246c20437f49111e5dcc0781d6d024 (diff)
downloadrails-b4e97ea2d961c7ed99dcfa48044f4922378ff9cf.tar.gz
rails-b4e97ea2d961c7ed99dcfa48044f4922378ff9cf.tar.bz2
rails-b4e97ea2d961c7ed99dcfa48044f4922378ff9cf.zip
Tidy up migration types.
Diffstat (limited to 'activerecord/lib/rails/generators/active_record/model/templates')
-rw-r--r--activerecord/lib/rails/generators/active_record/model/templates/migration.rb9
1 files changed, 2 insertions, 7 deletions
diff --git a/activerecord/lib/rails/generators/active_record/model/templates/migration.rb b/activerecord/lib/rails/generators/active_record/model/templates/migration.rb
index 0715d0262b..3a3cf86d73 100644
--- a/activerecord/lib/rails/generators/active_record/model/templates/migration.rb
+++ b/activerecord/lib/rails/generators/active_record/model/templates/migration.rb
@@ -8,13 +8,8 @@ class <%= migration_class_name %> < ActiveRecord::Migration
t.timestamps
<% end -%>
end
-<% if options[:indexes] -%>
-<% attributes.select {|attr| attr.reference? }.each do |attribute| -%>
- add_index :<%= table_name %>, :<%= attribute.name %>_id<%= attribute.inject_index_options %>
-<% end -%>
-<% end -%>
-<% attributes.select {|attr| attr.has_index? }.each do |attribute| -%>
- add_index :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_index_options %>
+<% attributes_with_index.each do |attribute| -%>
+ add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
<% end -%>
end
end