Skip to content
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

Jump to bottom

Fix 6.1 compatability with ruby 2.5 #45593

Merged
merged 2 commits into from
Jul 15, 2022
Merged

Fix 6.1 compatability with ruby 2.5 #45593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ab06e5
Fix compatability with ruby 2.5
skipkayhil Jul 13, 2022
6a421e4
Fix test for default yaml_column_permitted_classes
skipkayhil Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions activerecord/lib/active_record/coders/yaml_column.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,20 @@ def check_arity_of_constructor
def yaml_load(payload)
if ActiveRecord::Base.use_yaml_unsafe_load
YAML.unsafe_load(payload)
else
elsif YAML.method(:safe_load).parameters.include?([:key, :permitted_classes])
YAML.safe_load(payload, permitted_classes: ActiveRecord::Base.yaml_column_permitted_classes, aliases: true)
else
YAML.safe_load(payload, ActiveRecord::Base.yaml_column_permitted_classes, [], true)
end
end
else
def yaml_load(payload)
if ActiveRecord::Base.use_yaml_unsafe_load
YAML.load(payload)
else
elsif YAML.method(:safe_load).parameters.include?([:key, :permitted_classes])
YAML.safe_load(payload, permitted_classes: ActiveRecord::Base.yaml_column_permitted_classes, aliases: true)
else
YAML.safe_load(payload, ActiveRecord::Base.yaml_column_permitted_classes, [], true)
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions railties/test/application/configuration_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2244,9 +2244,9 @@ class D < C
assert ActiveRecord::Base.use_yaml_unsafe_load
end

test "config.active_record.yaml_column_permitted_classes is [] by default" do
test "config.active_record.yaml_column_permitted_classes is [Symbol] by default" do
app "production"
assert_equal([], ActiveRecord::Base.yaml_column_permitted_classes)
assert_equal([Symbol], ActiveRecord::Base.yaml_column_permitted_classes)
end

test "config.active_record.yaml_column_permitted_classes can be configured" do
Expand Down