aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-09 16:13:48 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-09 16:13:48 -0300
commitddb0b4a474de99fa8474e2111a05dd4bba7c6f0e (patch)
tree504334562aa90a23f286616fcb36604628182e06 /activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb
parent19f1cfbb03f8230f5d30cc91c41c3f719813da9d (diff)
parentc93dbfef36c9b095121650beec2362de42d6b715 (diff)
downloadrails-ddb0b4a474de99fa8474e2111a05dd4bba7c6f0e.tar.gz
rails-ddb0b4a474de99fa8474e2111a05dd4bba7c6f0e.tar.bz2
rails-ddb0b4a474de99fa8474e2111a05dd4bba7c6f0e.zip
Merge pull request #15591 from sgrif/sg-rm-write-attribute
Make `_before_type_cast` actually be before type cast
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb
index c87422fe32..c64cf27797 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb
@@ -7,7 +7,11 @@ module ActiveRecord
:json
end
- def type_cast_for_write(value)
+ def type_cast_from_user(value)
+ type_cast(type_cast_for_database(value))
+ end
+
+ def type_cast_for_database(value)
ConnectionAdapters::PostgreSQLColumn.json_to_string(value)
end