Skip to content

feat: Upgrade to sqlparser-rs 0.62.0 #22069

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
andygrove wants to merge 8 commits into
base: main
Choose a base branch
from
Open

feat: Upgrade to sqlparser-rs 0.62.0 #22069

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
658827d
chore: pin sqlparser to apache/datafusion-sqlparser-rs main (9833c033)
andygrove Apr 30, 2026
5374947
docs: explain exclude_owned scope and large_enum_variant suppression
andygrove Apr 30, 2026
abf1cac
refactor: use ObjectNamePart::as_ident() for ObjectName→Ident conversion
andygrove Apr 30, 2026
b6ee65b
use sqlparser 0.62.0 release
andygrove May 7, 2026
c6813c0
Merge remote-tracking branch 'apache/main' into sqlparser-0.62.0
andygrove May 7, 2026
7829edf
fix: regenerate Cargo.lock to repair merge artifact
andygrove May 7, 2026
dd8a549
Consolidate and document SQL AST shims
alamb May 10, 2026
0dcd70f
refactor: align fallback SQL AST shims with sqlparser 0.62
andygrove May 10, 2026
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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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 @@ -192,7 +192,7 @@ regex = "1.12"
rstest = "0.26.1"
serde_json = "1"
sha2 = "^0.11.0"
sqlparser = { version = "0.61.0", default-features = false, features = ["std", "visitor"] }
sqlparser = { version = "0.62.0", default-features = false, features = ["std", "visitor"] }
strum = "0.28.0"
strum_macros = "0.28.0"
tempfile = "3"
Expand Down
4 changes: 2 additions & 2 deletions datafusion/expr/src/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4123,8 +4123,8 @@ mod test {
wildcard_with_options(wildcard_options(
None,
Some(ExcludeSelectItem::Multiple(vec![
Ident::from("c1"),
Ident::from("c2")
Ident::from("c1").into(),
Ident::from("c2").into()
])),
None,
None,
Expand Down
31 changes: 31 additions & 0 deletions datafusion/expr/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,38 @@ fn get_excluded_columns(
idents.push(&excepts.first_element);
idents.extend(&excepts.additional_elements);
}
// Declared outside the `if let` so `idents.extend(exclude_owned.iter())`
// below can borrow references that outlive the inner scope.
#[cfg(feature = "sql")]
let exclude_owned: Vec<sqlparser::ast::Ident>;
if let Some(exclude) = opt_exclude {
#[cfg(feature = "sql")]
Copy link
Copy Markdown
Member Author

@andygrove andygrove May 7, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

I'm not too sure about this feature gating, tbh.

This is what Claude suggested

Copy link
Copy Markdown
Member Author

@andygrove andygrove May 7, 2026

Choose a reason for hiding this comment

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

Claude says:

Here's what's happening and why the cfg(feature = "sql") gates exist:

The setup. datafusion-expr has a sql feature (on by default) that depends on sqlparser. When sql is enabled, ExcludeSelectItem is re-exported from sqlparser::ast. When it's disabled, expr.rs provides its
own fallback enum with Ident payloads (datafusion/expr/src/expr.rs:1431-1436). The two paths in utils.rs already exist via the existing #[cfg(...)] imports at lines 41-45.

What sqlparser 0.62 changed. In 0.61, ExcludeSelectItem::Single carried Ident and Multiple carried Vec. In 0.62, both now carry ObjectName (a possibly multi-part name like schema.column). The
fallback enum in expr.rs still uses Ident because that crate-local copy hasn't changed.

Copy link
Copy Markdown
Contributor

@alamb alamb May 9, 2026

Choose a reason for hiding this comment

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

I suggest we should update the fallback copy in DataFusion to match the sql parser one.

For example

datafusion/datafusion/expr/src/expr.rs

Lines 1452 to 1457 in 658827d

#[derive(Clone, PartialEq, Eq, PartialOrd, Hash, Debug)]
#[cfg(not(feature = "sql"))]
pub struct ExceptSelectItem {
pub first_element: Ident,
pub additional_elements: Vec<Ident>,
}

That will avoid the need to have two copies

Looks like this copy came in via #17332 from @timsaucer

Maybe we can add some comments explaining the rationale for the second copy better (any isolate the cfg sql somewhere to make it clearer)

Copy link
Copy Markdown
Contributor

@comphead comphead May 9, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

I was trying to understand it. My understanding of this, please correct if I'm wrong is supporting select * exclude(col) using sqlparser(sql feature is on) and using Datafuiosn, specifically referring to ExceptSelectItem. Why we need to keep parts of parser in DF? Maybe I'm missing something

Copy link
Copy Markdown
Contributor

@comphead comphead May 9, 2026

Choose a reason for hiding this comment

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

Why can't we have unified approach, to use parser or use DataFusion, did they diverge at some point?

Copy link
Copy Markdown
Contributor

@alamb alamb May 10, 2026

Choose a reason for hiding this comment

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

Why we need to keep parts of parser in DF? Maybe I'm missing something

I think the idea is to avoid a dependency on sqlparser-rs if you aren't using the SQL interface

For some users, adding in sqlparser greatly increases build times for their projects even though they are not using sql. This feature makes sql an optional dependency to improve build times and reduce the number of dependencies.

I will propose some comments to make this celar

Copy link
Copy Markdown
Contributor

@alamb alamb May 10, 2026

Choose a reason for hiding this comment

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

I made a PR to try and make the "use ast shims" clearer

{
let object_name_to_ident =
|name: &sqlparser::ast::ObjectName| -> Result<sqlparser::ast::Ident> {
if name.0.len() != 1 {
return plan_err!(
"EXCLUDE with multi-part identifiers is not supported: {name}"
);
}
let part = &name.0[0];
let Some(ident) = part.as_ident() else {
return plan_err!(
"EXCLUDE with non-identifier name part is not supported: {part}"
);
};
Ok(ident.clone())
};
exclude_owned = match exclude {
ExcludeSelectItem::Single(name) => vec![object_name_to_ident(name)?],
ExcludeSelectItem::Multiple(names) => names
.iter()
.map(object_name_to_ident)
.collect::<Result<Vec<_>>>()?,
};
idents.extend(exclude_owned.iter());
}
#[cfg(not(feature = "sql"))]
match exclude {
ExcludeSelectItem::Single(ident) => idents.push(ident),
ExcludeSelectItem::Multiple(idents_inner) => idents.extend(idents_inner),
Expand Down
15 changes: 10 additions & 5 deletions datafusion/sql/src/expr/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,10 +927,15 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
);
}

if lambda.params.iter().any(|p| p.data_type.is_some()) {
return not_impl_err!(
"Lambda parameters with explicit data types are not supported"
);
}
let params = lambda
.params
.iter()
.map(|p| crate::utils::normalize_ident(p.clone()))
.map(|p| crate::utils::normalize_ident(p.name.clone()))
.collect();

let lambda_parameters = std::iter::zip(lambda_params, &params)
Expand Down Expand Up @@ -1181,19 +1186,19 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
/// After normalization with [normalize_ident], check whether all params are unique
///
/// [normalize_ident]: crate::utils::normalize_ident
fn all_unique(params: &[sqlparser::ast::Ident]) -> bool {
fn all_unique(params: &[sqlparser::ast::LambdaFunctionParameter]) -> bool {
match params.len() {
0 | 1 => true,
2 => {
crate::utils::normalize_ident(params[0].clone())
!= crate::utils::normalize_ident(params[1].clone())
crate::utils::normalize_ident(params[0].name.clone())
!= crate::utils::normalize_ident(params[1].name.clone())
}
_ => {
let mut set = HashSet::with_capacity(params.len());

params
.iter()
.map(|p| crate::utils::normalize_ident(p.clone()))
.map(|p| crate::utils::normalize_ident(p.name.clone()))
.all(|p| set.insert(p))
}
}
Expand Down
8 changes: 4 additions & 4 deletions datafusion/sql/src/expr/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
negated: bool,
expr: SQLExpr,
pattern: SQLExpr,
escape_char: Option<Value>,
escape_char: Option<ValueWithSpan>,
schema: &DFSchema,
planner_context: &mut PlannerContext,
case_insensitive: bool,
Expand All @@ -910,7 +910,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
return not_impl_err!("ANY in LIKE expression");
}
let pattern = self.sql_expr_to_logical_expr(pattern, schema, planner_context)?;
let escape_char = match escape_char {
let escape_char = match escape_char.map(|v| v.value) {
Some(Value::SingleQuotedString(char)) if char.len() == 1 => {
Some(char.chars().next().unwrap())
}
Expand All @@ -935,7 +935,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
negated: bool,
expr: SQLExpr,
pattern: SQLExpr,
escape_char: Option<Value>,
escape_char: Option<ValueWithSpan>,
schema: &DFSchema,
planner_context: &mut PlannerContext,
) -> Result<Expr> {
Expand All @@ -944,7 +944,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
if pattern_type != DataType::Utf8 && pattern_type != DataType::Null {
return plan_err!("Invalid pattern in SIMILAR TO expression");
}
let escape_char = match escape_char {
let escape_char = match escape_char.map(|v| v.value) {
Some(Value::SingleQuotedString(char)) if char.len() == 1 => {
Some(char.chars().next().unwrap())
}
Expand Down
1 change: 1 addition & 0 deletions datafusion/sql/src/query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
// Apply to all fields
columns: vec![],
explicit: true,
at: None,
},
),
PipeOperator::Union {
Expand Down
6 changes: 6 additions & 0 deletions datafusion/sql/src/select.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,9 @@ impl<S: ContextProvider> SqlToRel<'_, S> {

Ok(SelectExpr::Expression(expr))
}
SelectItem::ExprWithAliases { .. } => {
not_impl_err!("SELECT item with multiple aliases is not supported")
}
SelectItem::Wildcard(options) => {
Self::check_wildcard_options(&options)?;
if empty_from {
Expand Down Expand Up @@ -886,11 +889,14 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
opt_rename,
opt_replace: _opt_replace,
opt_ilike: _opt_ilike,
opt_alias,
wildcard_token: _wildcard_token,
} = options;

if opt_rename.is_some() {
not_impl_err!("wildcard * with RENAME not supported ")
} else if opt_alias.is_some() {
not_impl_err!("wildcard * with AS alias not supported")
} else {
Ok(())
}
Expand Down
Loading
Loading