Skip to content

fix: Enable WASM compilation by making sqlparser's recursive-protection optional #16418

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

Merged
merged 3 commits into from
Jun 17, 2025
Merged

fix: Enable WASM compilation by making sqlparser's recursive-protection optional #16418

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a24046
fix: Make sqlparser's recursive-protection optional for WASM compatib…
jonmmease Jun 15, 2025
58a67fe
fix: Include std feature for sqlparser
jonmmease Jun 15, 2025
485a505
review feedback
jonmmease Jun 16, 2025
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ recursive = "0.1.1"
regex = "1.8"
rstest = "0.25.0"
serde_json = "1"
sqlparser = { version = "0.55.0", features = ["visitor"] }
sqlparser = { version = "0.55.0", default-features = false, features = ["std", "visitor"] }
tempfile = "3"
tokio = { version = "1.45", features = ["macros", "rt", "sync"] }
url = "2.5.4"
Expand Down
5 changes: 5 additions & 0 deletions datafusion/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ default = [
"compression",
"parquet",
"recursive_protection",
"sqlparser_std",
"sqlparser_recursive_protection",
]
encoding_expressions = ["datafusion-functions/encoding_expressions"]
# Used for testing ONLY: causes all values to hash to the same value (test for collisions)
Expand All @@ -79,6 +81,9 @@ recursive_protection = [
"datafusion-physical-optimizer/recursive_protection",
"datafusion-sql/recursive_protection",
]
# Enable sqlparser's default features for backward compatibility
sqlparser_std = ["sqlparser/std"]
sqlparser_recursive_protection = ["sqlparser/recursive-protection"]
Copy link
Contributor

@alamb alamb Jun 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any need to add this new sqlparser_recursive_protection = ["sqlparser/recursive-protection"] feature? could we instead just add it to the recursive_protection existing feature?

recursive_protection = [
    "datafusion-common/recursive_protection",
    "datafusion-expr/recursive_protection",
    "datafusion-optimizer/recursive_protection",
    "datafusion-physical-optimizer/recursive_protection",
    "datafusion-sql/recursive_protection",
    "sqlparser/recursive-protection", # Add this???
]

I also don't fully understand why we need a new feature for sqlparser_std as that would seem to already be enabled

Copy link
Contributor Author

@jonmmease jonmmease Jun 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, yeah, good call. Made these updates in 485a505

serde = [
"dep:serde",
# Enable `#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]`
Expand Down