diff options
| author | Xavier Noria <fxn@hashref.com> | 2014-10-30 08:16:25 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2014-10-30 08:16:25 +0100 |
| commit | 7cf4d5465deb48f448000e9b484a150261e1054f (patch) | |
| tree | 364833bc132ca5dee94184b076cdbf63b6f29c6b /activerecord | |
| parent | 38259d36c42c101482b03f4a07897df3dd857497 (diff) | |
| parent | 352b031aa1acc42fdaa8b16d2c83affd62e6d963 (diff) | |
| download | rails-7cf4d5465deb48f448000e9b484a150261e1054f.tar.gz rails-7cf4d5465deb48f448000e9b484a150261e1054f.tar.bz2 rails-7cf4d5465deb48f448000e9b484a150261e1054f.zip | |
Merge pull request #17434 from claudiob/remove-redundant-to-s
Remove redundant `to_s` in interpolation
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index 0bf17d3351..7f04e35042 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -836,9 +836,9 @@ module ActiveRecord # Gather up all of the SET variables... variable_assignments = variables.map do |k, v| if v == ':default' || v == :default - "@@SESSION.#{k.to_s} = DEFAULT" # Sets the value to the global or compile default + "@@SESSION.#{k} = DEFAULT" # Sets the value to the global or compile default elsif !v.nil? - "@@SESSION.#{k.to_s} = #{quote(v)}" + "@@SESSION.#{k} = #{quote(v)}" end # or else nil; compact to clear nils out end.compact.join(', ') |