diff options
| author | Sean Griffin <sean@thoughtbot.com> | 2014-07-04 15:16:00 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@thoughtbot.com> | 2014-08-08 10:29:27 -0600 |
| commit | fdfc0fc6c91b46a3ff769687e1a456ef2b205417 (patch) | |
| tree | 9ff94e55f5837376b0b65de720137fe65a6040bc /activerecord/lib/rails | |
| parent | c69e21d36b3a14f6894fb768ffeb165bd8d7c533 (diff) | |
| download | rails-fdfc0fc6c91b46a3ff769687e1a456ef2b205417.tar.gz rails-fdfc0fc6c91b46a3ff769687e1a456ef2b205417.tar.bz2 rails-fdfc0fc6c91b46a3ff769687e1a456ef2b205417.zip | |
Add a `required` option to the model generator
Syntax was chosen to follow the passing of multiple options to
decimal/numeric types. Curly braces, and allowing any of `,`, `.`, or
`-` to be used as a separator to avoid the need for shell quoting. (I'm
intending to expand this to all columns, but that's another PR.
The `required` option will cause 2 things to change. `required: true`
will be added to the association. `null: false` will be added to the
column in the migration.
Diffstat (limited to 'activerecord/lib/rails')
| -rw-r--r-- | activerecord/lib/rails/generators/active_record/migration/migration_generator.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/rails/generators/active_record/model/templates/model.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb index d3c853cfea..7a3c6f5e95 100644 --- a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb +++ b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb @@ -55,7 +55,7 @@ module ActiveRecord def attributes_with_index attributes.select { |a| !a.reference? && a.has_index? } end - + def validate_file_name! unless file_name =~ /^[_a-z0-9]+$/ raise IllegalMigrationNameError.new(file_name) diff --git a/activerecord/lib/rails/generators/active_record/model/templates/model.rb b/activerecord/lib/rails/generators/active_record/model/templates/model.rb index 808598699b..539d969fce 100644 --- a/activerecord/lib/rails/generators/active_record/model/templates/model.rb +++ b/activerecord/lib/rails/generators/active_record/model/templates/model.rb @@ -1,7 +1,7 @@ <% module_namespacing do -%> class <%= class_name %> < <%= parent_class_name.classify %> <% attributes.select(&:reference?).each do |attribute| -%> - belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %> + belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %><%= ', required: true' if attribute.required? %> <% end -%> <% if attributes.any?(&:password_digest?) -%> has_secure_password |