Skip to content

Support json 3 #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marciotoshio wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support json 3 #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/que/utils/json_serialization.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ def serialize_json(object)
end

def deserialize_json(json)
# Allowing `create_additions` would be a security vulnerability.
JSON.parse(json, symbolize_names: true, create_additions: false)
JSON.parse(json, symbolize_names: true)
end
end
end
Expand Down
6 changes: 3 additions & 3 deletions spec/que/migrations.current_schema_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def assert_constraint_error(name, &block)
].each do |args|
assert_constraint_error 'valid_args' do
DB[:que_jobs].
insert(job_class: 'Que::Job', job_schema_version: Que.job_schema_version, args: JSON.generate(args, quirks_mode: true))
insert(job_class: 'Que::Job', job_schema_version: Que.job_schema_version, args: JSON.generate(args))
end
end
end
Expand Down Expand Up @@ -186,12 +186,12 @@ def assert_constraint_error(name, &block)
end

assert_constraint_error 'valid_value' do
value_attrs[:value] = JSON.generate(5, quirks_mode: true)
value_attrs[:value] = JSON.generate(5)
DB[:que_values].insert(value_attrs)
end

assert_constraint_error 'valid_value' do
value_attrs[:value] = JSON.generate("string", quirks_mode: true)
value_attrs[:value] = JSON.generate("string")
DB[:que_values].insert(value_attrs)
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/que/migrations_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def assert_up_migration(v3: {}, v4: {})
version_3 do
# The table primary key is different at this schema version, so provide a
# returning clause so that Sequel doesn't get confused.
DB[:que_jobs].returning(:job_id).insert(v3_default.merge(v3).tap{|j| j[:args] = JSON.generate(j[:args], quirks_mode: true)})
DB[:que_jobs].returning(:job_id).insert(v3_default.merge(v3).tap{|j| j[:args] = JSON.generate(j[:args])})
end

assert_equal(
Expand Down