diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-07-02 01:07:08 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2017-07-02 01:07:12 +0930 |
| commit | afb66a5a598ce4ac74ad84b125a5abf046dcf5aa (patch) | |
| tree | 33d690f194f243a3fb63e69f8393ff46cc396249 /activerecord/lib/active_record/associations | |
| parent | 9ecdcac16795854bd02f1addcf75b84d34bbdf86 (diff) | |
| parent | 3d453b409d037a056d0bcd636a2e020cc7cef4a8 (diff) | |
| download | rails-afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.tar.gz rails-afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.tar.bz2 rails-afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.zip | |
Merge pull request #29506 from pat/frozen-string-literals
Make ActiveSupport frozen-string-literal friendly.
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/join_dependency.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb index bc66194aef..04cdcb6a7f 100644 --- a/activerecord/lib/active_record/associations/join_dependency.rb +++ b/activerecord/lib/active_record/associations/join_dependency.rb @@ -198,8 +198,7 @@ module ActiveRecord def table_alias_for(reflection, parent, join) name = "#{reflection.plural_name}_#{parent.table_name}" - name << "_join" if join - name + join ? "#{name}_join" : name end def walk(left, right) |