mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fix bug in JSON deserialization when column default is an empty string
When `ActiveRecord::Coders::JSON` serialization is used and the default of the column returns `''` it raises the following error: ``` JSON::ParserError: A JSON text must at least contain two octets! ``` If MySQL is running in non-strict mode, it returns an empty string as column default for a text column: ```ruby def extract_default if blob_or_text_column? @default = null || strict ? nil : '' end end ``` Since `''` is invalid JSON, there shouldn't be an attempt to parse it, it should be treated like nil. ActiveRecord::Coders::JSON should behave consistently for all possible non-user-set column default values.
This commit is contained in:
parent
aa3d440871
commit
894facb196
3 changed files with 21 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
* Handle JSON deserialization correctly if the column default from database
|
||||||
|
adapter returns `''` instead of `nil`.
|
||||||
|
|
||||||
|
*Johannes Opper*
|
||||||
|
|
||||||
* Ensure that mutations of the array returned from `ActiveRecord::Relation#to_a`
|
* Ensure that mutations of the array returned from `ActiveRecord::Relation#to_a`
|
||||||
do not affect the original relation, by returning a duplicate array each time.
|
do not affect the original relation, by returning a duplicate array each time.
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ module ActiveRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.load(json)
|
def self.load(json)
|
||||||
ActiveSupport::JSON.decode(json) unless json.nil?
|
ActiveSupport::JSON.decode(json) unless json.blank?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
15
activerecord/test/cases/coders/json_test.rb
Normal file
15
activerecord/test/cases/coders/json_test.rb
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
require "cases/helper"
|
||||||
|
|
||||||
|
module ActiveRecord
|
||||||
|
module Coders
|
||||||
|
class JSONTest < ActiveRecord::TestCase
|
||||||
|
def test_returns_nil_if_empty_string_given
|
||||||
|
assert_nil JSON.load("")
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_returns_nil_if_nil_given
|
||||||
|
assert_nil JSON.load(nil)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in a new issue