diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2019-02-11 13:50:33 +0900 |
---|---|---|
committer | Ryuta Kamizono <kamipo@gmail.com> | 2019-02-11 13:55:06 +0900 |
commit | d87afbf46f87a7fb8e9fef5c1b8422cdf386f4cb (patch) | |
tree | ffbd3f7ad2c125097135d6d494fe2d222d69c575 /activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | |
parent | 9099d66bc38f2e560613258f520d46df624d99c0 (diff) | |
download | rails-d87afbf46f87a7fb8e9fef5c1b8422cdf386f4cb.tar.gz rails-d87afbf46f87a7fb8e9fef5c1b8422cdf386f4cb.tar.bz2 rails-d87afbf46f87a7fb8e9fef5c1b8422cdf386f4cb.zip |
More exercise table name prefix and suffix tests
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 | 10 |
1 files changed, 7 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 d88e75d692..78e153bcc9 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -1029,9 +1029,7 @@ module ActiveRecord end def foreign_key_column_for(table_name) # :nodoc: - prefix = Base.table_name_prefix - suffix = Base.table_name_suffix - name = table_name.to_s =~ /#{prefix}(.+)#{suffix}/ ? $1 : table_name.to_s + name = strip_table_name_prefix_and_suffix(table_name) "#{name.singularize}_id" end @@ -1328,6 +1326,12 @@ module ActiveRecord { column: column_names } end + def strip_table_name_prefix_and_suffix(table_name) + prefix = Base.table_name_prefix + suffix = Base.table_name_suffix + table_name.to_s =~ /#{prefix}(.+)#{suffix}/ ? $1 : table_name.to_s + end + def foreign_key_name(table_name, options) options.fetch(:name) do identifier = "#{table_name}_#{options.fetch(:column)}_fk" |