diff options
| author | kp <keith.j.payne@gmail.com> | 2016-02-10 17:44:54 +0000 |
|---|---|---|
| committer | kp <keith.j.payne@gmail.com> | 2016-02-10 17:44:54 +0000 |
| commit | ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30 (patch) | |
| tree | 741019b3fbf474ff4cdeefdbeb6ff1f598ffcdfc /activerecord/lib/rails | |
| parent | 8641de93eb98d4ebdb0db2530c8c79c0c4e2f95e (diff) | |
| parent | 688996da7b25080a1a2ef74f5b4789f3e5eb670d (diff) | |
| download | rails-ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30.tar.gz rails-ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30.tar.bz2 rails-ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30.zip | |
Merge remote-tracking branch 'origin/master' into actioncable_logging
Diffstat (limited to 'activerecord/lib/rails')
| -rw-r--r-- | activerecord/lib/rails/generators/active_record/migration/templates/migration.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb b/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb index 107f107dc4..481c70201b 100644 --- a/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb +++ b/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb @@ -19,7 +19,11 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi def change create_join_table :<%= join_tables.first %>, :<%= join_tables.second %> do |t| <%- attributes.each do |attribute| -%> + <%- if attribute.reference? -%> + t.references :<%= attribute.name %><%= attribute.inject_options %> + <%- else -%> <%= '# ' unless attribute.has_index? -%>t.index <%= attribute.index_name %><%= attribute.inject_index_options %> + <%- end -%> <%- end -%> end end |