Support psych 4 #4
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
playerace
commented
Oct 20, 2023
Comment on lines
+49
to
+55
| if ActiveRecord::Base.use_yaml_unsafe_load | ||
| YAML.unsafe_load(yaml) | ||
| elsif YAML.method(:safe_load).parameters.include?([:key, :permitted_classes]) | ||
| YAML.safe_load(yaml, permitted_classes: ActiveRecord::Base.yaml_column_permitted_classes, aliases: true) | ||
| else | ||
| YAML.safe_load(yaml, ActiveRecord::Base.yaml_column_permitted_classes, [], true) | ||
| end |
There was a problem hiding this comment.
This will not affect TE master on 3.0.4 because we still use SafeYAML and this part of the change will only be used once the SafeYAML gem is removed.
The else at line 53 will also handle Psych 3.3.2 when it was still using positional arguments instead of keyword arguments. ruby/psych@v3.3.2...v4.0.0#diff-659eac8589abc82c9a0ab3699e4e4be4774d9c09c6c9934af5d9dae0d264439cL330
melvrickgoh
approved these changes
Oct 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bacgkground
With TE upgrading to ruby 3.1.4 (internally using Psych 4), we can follow the rails team loading of
YAML.safe_load.We also now have the option of removing
safe_yamlgem in TE.