diff options
Diffstat (limited to 'activerecord/lib/rails/generators/active_record/model')
| -rw-r--r-- | activerecord/lib/rails/generators/active_record/model/model_generator.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/rails/generators/active_record/model/templates/migration.rb | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/activerecord/lib/rails/generators/active_record/model/model_generator.rb b/activerecord/lib/rails/generators/active_record/model/model_generator.rb index f7caa43ac8..c0527e231f 100644 --- a/activerecord/lib/rails/generators/active_record/model/model_generator.rb +++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb @@ -3,7 +3,7 @@ require 'rails/generators/active_record' module ActiveRecord module Generators class ModelGenerator < Base - argument :attributes, :type => :array, :default => [], :banner => "field:type field:type" + argument :attributes, :type => :array, :default => [], :banner => "field:type field:type field:type:index" check_class_collision 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 851930344a..0715d0262b 100644 --- a/activerecord/lib/rails/generators/active_record/model/templates/migration.rb +++ b/activerecord/lib/rails/generators/active_record/model/templates/migration.rb @@ -2,7 +2,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration def change create_table :<%= table_name %> do |t| <% attributes.each do |attribute| -%> - t.<%= attribute.type %> :<%= attribute.name %> + t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %> <% end -%> <% if options[:timestamps] %> t.timestamps @@ -10,8 +10,11 @@ class <%= migration_class_name %> < ActiveRecord::Migration end <% if options[:indexes] -%> <% attributes.select {|attr| attr.reference? }.each do |attribute| -%> - add_index :<%= table_name %>, :<%= attribute.name %>_id + 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 %> +<% end -%> end end |