diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 16:15:25 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 16:15:25 -0600 |
| commit | 7df83b5d9505136afdca20840c67fc4deb7a1adf (patch) | |
| tree | 8a788b8a2eeaf3f66d3722abdb4c61e713729ae8 /activerecord | |
| parent | ea9bc06c9a47b839d5e2db94ba6bf7e29c8f0ae9 (diff) | |
| parent | fb42c492a7eff58f45867ea50440d938648cdb48 (diff) | |
| download | rails-7df83b5d9505136afdca20840c67fc4deb7a1adf.tar.gz rails-7df83b5d9505136afdca20840c67fc4deb7a1adf.tar.bz2 rails-7df83b5d9505136afdca20840c67fc4deb7a1adf.zip | |
Merge pull request #21762 from jmccartie/jm/uuid
Set active_record config for always creating uuids in generators
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 7 | ||||
| -rw-r--r-- | activerecord/lib/rails/generators/active_record/migration/templates/create_table_migration.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 0c3c21202f..258b2be899 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,10 @@ +* Add ability to default to `uuid` as primary key when generating database migrations + + Set `Rails.application.config.active_record.primary_key = :uuid` + or `config.active_record.primary_key = :uuid` in config/application.rb + + *Jon McCartie* + * Don't cache arguments in #find_by if they are an ActiveRecord::Relation Fixes #20817 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 5b3e57dcf6..4a7deb3c75 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 %> do |t| + create_table :<%= table_name %><%= id_kind %> do |t| <% attributes.each do |attribute| -%> <% if attribute.password_digest? -%> t.string :password_digest<%= attribute.inject_options %> |