diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-12-20 08:45:54 -0200 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-12-23 16:28:35 -0200 |
commit | 9e1740af9c1a00980b30c66aba3c223c33e646e4 (patch) | |
tree | 0ad9eb3cb5820bf8b6c117a69c307b0c678f4002 /activerecord/lib | |
parent | 73bba4c1e1f7fa23aa1a126971338d94ae42398f (diff) | |
download | rails-9e1740af9c1a00980b30c66aba3c223c33e646e4.tar.gz rails-9e1740af9c1a00980b30c66aba3c223c33e646e4.tar.bz2 rails-9e1740af9c1a00980b30c66aba3c223c33e646e4.zip |
Tidy up fix for PG extensions quoting
Always pass in the column for quote_bound_value and quote using it in
case it exists there.
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/sanitization.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/sanitization.rb b/activerecord/lib/active_record/sanitization.rb index bc78c3858a..dacaec26b7 100644 --- a/activerecord/lib/active_record/sanitization.rb +++ b/activerecord/lib/active_record/sanitization.rb @@ -100,8 +100,9 @@ module ActiveRecord # { status: nil, group_id: 1 } # # => "status = NULL , group_id = 1" def sanitize_sql_hash_for_assignment(attrs, table) + c = connection attrs.map do |attr, value| - "#{connection.quote_table_name_for_assignment(table, attr)} = #{quote_bound_value(value, connection, columns_hash[attr.to_s])}" + "#{c.quote_table_name_for_assignment(table, attr)} = #{quote_bound_value(value, c, columns_hash[attr.to_s])}" end.join(', ') end @@ -153,15 +154,16 @@ module ActiveRecord end def quote_bound_value(value, c = connection, column = nil) #:nodoc: - db_native_type = column && (column.respond_to?(:array) && column.array || [:json, :hstore].include?(column.type) ) - if value.respond_to?(:map) && !value.acts_like?(:string) && !db_native_type + if column + c.quote(value, column) + elsif value.respond_to?(:map) && !value.acts_like?(:string) if value.respond_to?(:empty?) && value.empty? c.quote(nil) else value.map { |v| c.quote(v) }.join(',') end else - c.quote(value, column) + c.quote(value) end end |