diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-09-23 11:39:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-23 11:39:52 -0700 |
| commit | da8cd519ad8265660382f9b91d7ddee4309ef4ca (patch) | |
| tree | 8ea4c551d3bfa5252db0ab2081d813727cf08719 /activerecord/lib | |
| parent | 0bc196518a7369d1279a11faad8aef2442539c82 (diff) | |
| parent | 21675fdc441e5d67dd6bc007979523db164a5b2d (diff) | |
| download | rails-da8cd519ad8265660382f9b91d7ddee4309ef4ca.tar.gz rails-da8cd519ad8265660382f9b91d7ddee4309ef4ca.tar.bz2 rails-da8cd519ad8265660382f9b91d7ddee4309ef4ca.zip | |
Merge pull request #25670 from tdtran/fix-nil-json
Serialize JSON attribute value nil as SQL NULL, not JSON 'null'
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/type/internal/abstract_json.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/type/internal/abstract_json.rb b/activerecord/lib/active_record/type/internal/abstract_json.rb index 513c938088..e19c5a14da 100644 --- a/activerecord/lib/active_record/type/internal/abstract_json.rb +++ b/activerecord/lib/active_record/type/internal/abstract_json.rb @@ -17,7 +17,11 @@ module ActiveRecord end def serialize(value) - ::ActiveSupport::JSON.encode(value) + if value.nil? + nil + else + ::ActiveSupport::JSON.encode(value) + end end def accessor |