aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-27 01:50:51 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-27 01:50:51 -0300
commit9f94f73743a48511154d2801c484d9ac195832be (patch)
tree443726ef19057247fe5ef12fac0ee29f0da24292 /activerecord/lib/active_record/connection_adapters
parent859c8c3f6727d000bd7fd12933c37b91fda3ad98 (diff)
parentc26b9148e5b0681e7d00ec651bd568570e284d91 (diff)
downloadrails-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/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb5
1 files changed, 4 insertions, 1 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: