diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-06-04 02:54:40 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-06-04 02:54:40 +0930 |
| commit | 7a25444f182f76696ab1f0824464025a9e121f8e (patch) | |
| tree | b3dedecdebc71d108a34fcf3e06eda8a07503084 /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | |
| parent | 4bcf9029452e0c760af04faab6b549710401e8cf (diff) | |
| parent | 74a756a8b43e2eb5e743d32fa4f6089be2246a58 (diff) | |
| download | rails-7a25444f182f76696ab1f0824464025a9e121f8e.tar.gz rails-7a25444f182f76696ab1f0824464025a9e121f8e.tar.bz2 rails-7a25444f182f76696ab1f0824464025a9e121f8e.zip | |
Merge pull request #15486 from sgrif/sg-binary-quoting
Refactor quoting of binary data to not be based on the column type
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 7 |
1 files changed, 3 insertions, 4 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 2677b6ee83..759ac9943f 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -218,10 +218,9 @@ module ActiveRecord # QUOTING ================================================== - def quote(value, column = nil) - if value.kind_of?(String) && column && column.type == :binary - s = value.unpack("H*")[0] - "x'#{s}'" + def _quote(value) # :nodoc: + if value.is_a?(Type::Binary::Data) + "x'#{value.hex}'" else super end |