diff options
| author | Jon McCartie <jon@mccartie.com> | 2015-10-22 09:11:42 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-10-23 21:34:00 -0200 |
| commit | f0323288da939f57641b82041cb1a86a1e526746 (patch) | |
| tree | af45e828083fb8a6361889fc93b0a8b12a4a99ae /activerecord/lib/rails | |
| parent | f94e328cf801fd5c8055b06c4ee5439273146833 (diff) | |
| download | rails-f0323288da939f57641b82041cb1a86a1e526746.tar.gz rails-f0323288da939f57641b82041cb1a86a1e526746.tar.bz2 rails-f0323288da939f57641b82041cb1a86a1e526746.zip | |
Move default uuid generation to active_record
Diffstat (limited to 'activerecord/lib/rails')
| -rw-r--r-- | activerecord/lib/rails/generators/active_record.rb | 8 | ||||
| -rw-r--r-- | activerecord/lib/rails/generators/active_record/migration/templates/create_table_migration.rb | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/activerecord/lib/rails/generators/active_record.rb b/activerecord/lib/rails/generators/active_record.rb index dc29213235..425512cc43 100644 --- a/activerecord/lib/rails/generators/active_record.rb +++ b/activerecord/lib/rails/generators/active_record.rb @@ -12,6 +12,14 @@ module ActiveRecord def self.base_root File.dirname(__FILE__) end + + private + def primary_key_type + key_type = Rails::Generators.options[:active_record][:primary_key_type] + ", id: :#{key_type}" if key_type + end + + end end end diff --git a/activerecord/lib/rails/generators/active_record/migration/templates/create_table_migration.rb b/activerecord/lib/rails/generators/active_record/migration/templates/create_table_migration.rb index 4a7deb3c75..fadab2a1e6 100644 --- a/activerecord/lib/rails/generators/active_record/migration/templates/create_table_migration.rb +++ b/activerecord/lib/rails/generators/active_record/migration/templates/create_table_migration.rb @@ -1,6 +1,6 @@ class <%= migration_class_name %> < ActiveRecord::Migration def change - create_table :<%= table_name %><%= id_kind %> do |t| + create_table :<%= table_name %><%= primary_key_type %> do |t| <% attributes.each do |attribute| -%> <% if attribute.password_digest? -%> t.string :password_digest<%= attribute.inject_options %> |