diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-04-06 10:40:14 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-04-06 10:42:44 +0200 |
| commit | 51eacc71c7d2a6d0fc23556b32e12a21ee49b948 (patch) | |
| tree | 5d49984b4a332be6656e4031a8140ae9c48d1609 /activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | |
| parent | e527688d19f7f11780a6d01a45e6625c34eb8e7d (diff) | |
| parent | 8c1180731f26e09a5163cfe96b7726c9e425207b (diff) | |
| download | rails-51eacc71c7d2a6d0fc23556b32e12a21ee49b948.tar.gz rails-51eacc71c7d2a6d0fc23556b32e12a21ee49b948.tar.bz2 rails-51eacc71c7d2a6d0fc23556b32e12a21ee49b948.zip | |
Merge pull request #19652 from vngrs/pluralize_foreign_key_table_name_bug
use singular table name if pluralize_table_names is setted as false whil...
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 2 |
1 files changed, 1 insertions, 1 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 a768ee2d70..cb83d0022c 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -138,7 +138,7 @@ module ActiveRecord end def foreign_table_name - name.to_s.pluralize + Base.pluralize_table_names ? name.to_s.pluralize : name end end |