diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-13 10:54:30 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-13 10:54:30 -0300 |
commit | 1c41d3b9827e839c0fc559b95cb07e45970b5ebb (patch) | |
tree | 69d206a7bba8e39e1510b91fe5e795fd12929c1e /activerecord/lib | |
parent | 9a0c2e5c626cfbde527013bd0cfcec682baa48fa (diff) | |
parent | d569d0baad8b4c30b2144de2af1c98f2e91a2099 (diff) | |
download | rails-1c41d3b9827e839c0fc559b95cb07e45970b5ebb.tar.gz rails-1c41d3b9827e839c0fc559b95cb07e45970b5ebb.tar.bz2 rails-1c41d3b9827e839c0fc559b95cb07e45970b5ebb.zip |
Merge pull request #15686 from sgrif/sg-pg-int-arrays
PG arrays should type cast user input
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb | 12 |
1 files changed, 8 insertions, 4 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 87817fe8d1..4e7d472d97 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb @@ -12,12 +12,16 @@ module ActiveRecord def type_cast_from_database(value) if value.is_a?(::String) - type_cast_array(parse_pg_array(value)) + type_cast_array(parse_pg_array(value), :type_cast_from_database) else super end end + def type_cast_from_user(value) + type_cast_array(value, :type_cast_from_user) + end + # Loads pg_array_parser if available. String parsing can be # performed quicker by a native extension, which will not create # a large amount of Ruby objects that will need to be garbage @@ -32,11 +36,11 @@ module ActiveRecord private - def type_cast_array(value) + def type_cast_array(value, method) if value.is_a?(::Array) - value.map { |item| type_cast_array(item) } + value.map { |item| type_cast_array(item, method) } else - @subtype.type_cast_from_database(value) + @subtype.public_send(method, value) end end end |