diff options
| author | Aleksey Magusev <lexmag@gmail.com> | 2012-07-19 00:24:21 +0400 |
|---|---|---|
| committer | Aleksey Magusev <lexmag@gmail.com> | 2012-07-19 00:24:21 +0400 |
| commit | 5a7d31913bb16977ec85d55de34ac0d79b512d62 (patch) | |
| tree | fe178a7dc9532832a8ec8ea992f28a29cae61320 /activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | |
| parent | fe5b943d9fd389f313dd87bf73b7c11b8746227b (diff) | |
| download | rails-5a7d31913bb16977ec85d55de34ac0d79b512d62.tar.gz rails-5a7d31913bb16977ec85d55de34ac0d79b512d62.tar.bz2 rails-5a7d31913bb16977ec85d55de34ac0d79b512d62.zip | |
Add fkey attributes to `join_table` migration generator
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb index a246e6ace1..a80c1cec39 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -204,11 +204,11 @@ module ActiveRecord join_table_name = find_join_table_name(table_1, table_2, options) column_options = options.delete(:column_options) || {} - column_options.reverse_merge!({:null => false}) + column_options.reverse_merge!(null: false) - t1_column, t2_column = [table_1, table_2].map{ |t| "#{t.to_s.singularize}_id" } + t1_column, t2_column = [table_1, table_2].map{ |t| t.to_s.singularize.foreign_key } - create_table(join_table_name, options.merge!(:id => false)) do |td| + create_table(join_table_name, options.merge!(id: false)) do |td| td.integer t1_column, column_options td.integer t2_column, column_options yield td if block_given? |