aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2017-03-06 11:00:46 +0000
committerGitHub <noreply@github.com>2017-03-06 11:00:46 +0000
commit0b5c7e354291bdf674fa8777b6443b224924bad4 (patch)
tree7167b977441ff5eb0f713ddda50f7739eeb2c7be /activerecord/lib/active_record/connection_adapters
parent99e4ed78b90c9df76b5444edf61575e2bfab1f85 (diff)
parent6ec2e8ac220024c6e8159c81dbe76ef8e812ed6f (diff)
downloadrails-0b5c7e354291bdf674fa8777b6443b224924bad4.tar.gz
rails-0b5c7e354291bdf674fa8777b6443b224924bad4.tar.bz2
rails-0b5c7e354291bdf674fa8777b6443b224924bad4.zip
Merge pull request #28295 from kamipo/fix_deserialize_with_json_array
Fix `deserialize` with JSON array
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb
index e1a75f8e5e..a73a8c1726 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb
@@ -23,7 +23,7 @@ module ActiveRecord
when ::String
type_cast_array(@pg_decoder.decode(value), :deserialize)
when Data
- deserialize(value.values)
+ type_cast_array(value.values, :deserialize)
else
super
end