diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-18 17:19:56 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-18 17:21:28 -0700 |
| commit | b36078fb8bf1a34e29bb4f029399c6428ca011ef (patch) | |
| tree | 1bffc9b565bd7c53a64b99e6c9e673ad041cddbc /activerecord/lib/active_record | |
| parent | 324cd2d0b55cc043f82db5292d693ace859c39ec (diff) | |
| parent | 0cae0ce5cec441e52a85d3345a7aab2f06918ddd (diff) | |
| download | rails-b36078fb8bf1a34e29bb4f029399c6428ca011ef.tar.gz rails-b36078fb8bf1a34e29bb4f029399c6428ca011ef.tar.bz2 rails-b36078fb8bf1a34e29bb4f029399c6428ca011ef.zip | |
Merge pull request #24614 from kamipo/foreign_key_respects_table_name_prefix_and_suffix
`foreign_key` respects `table_name_prefix` and `table_name_suffix`
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb index 9860f6e189..bbb0e9249d 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -331,6 +331,9 @@ module ActiveRecord end def foreign_key(table_name, options = {}) # :nodoc: + table_name_prefix = ActiveRecord::Base.table_name_prefix + table_name_suffix = ActiveRecord::Base.table_name_suffix + table_name = "#{table_name_prefix}#{table_name}#{table_name_suffix}" foreign_keys.push([table_name, options]) end |