diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-27 01:50:51 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-27 01:50:51 -0300 |
| commit | 9f94f73743a48511154d2801c484d9ac195832be (patch) | |
| tree | 443726ef19057247fe5ef12fac0ee29f0da24292 /activerecord/lib/active_record | |
| parent | 859c8c3f6727d000bd7fd12933c37b91fda3ad98 (diff) | |
| parent | c26b9148e5b0681e7d00ec651bd568570e284d91 (diff) | |
| download | rails-9f94f73743a48511154d2801c484d9ac195832be.tar.gz rails-9f94f73743a48511154d2801c484d9ac195832be.tar.bz2 rails-9f94f73743a48511154d2801c484d9ac195832be.zip | |
Merge pull request #20699 from vngrs/foreign_key_with_table_name_suffix_and_prefix
Add table name prefix and suffix support for foreign keys
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 5 | ||||
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 3 |
2 files changed, 6 insertions, 2 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 8bbd96e722..e3115abe66 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -837,7 +837,10 @@ module ActiveRecord end def foreign_key_column_for(table_name) # :nodoc: - "#{table_name.to_s.singularize}_id" + prefix = Base.table_name_prefix + suffix = Base.table_name_suffix + name = table_name.to_s =~ /#{prefix}(.+)#{suffix}/ ? $1 : table_name.to_s + "#{name.singularize}_id" end def dump_schema_information #:nodoc: diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index d41b7e88d5..4cfda302ea 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -640,7 +640,8 @@ module ActiveRecord unless @connection.respond_to? :revert unless arguments.empty? || [:execute, :enable_extension, :disable_extension].include?(method) arguments[0] = proper_table_name(arguments.first, table_name_options) - if [:rename_table, :add_foreign_key].include?(method) + if [:rename_table, :add_foreign_key].include?(method) || + (method == :remove_foreign_key && !arguments.second.is_a?(Hash)) arguments[1] = proper_table_name(arguments.second, table_name_options) end end |