chore(deps): Update sqlparser to 0.60 #19672

Standing-Man · 2026-01-07T05:52:36Z

Which issue does this PR close?

Closes bump sqlparser from 0.59.0 to 0.60.0 #19671.

Rationale for this change

What changes are included in this PR?

Are these changes tested?

Are there any user-facing changes?

Standing-Man · 2026-01-07T06:07:23Z

@Jefffrey and @comphead PTAL when you have time. 😸

Jefffrey · 2026-01-07T06:59:05Z

Could we address the CI failures? Looks like some tests are failing

Signed-off-by: StandingMan <jmtangcs@gmail.com>

Standing-Man · 2026-01-07T13:06:52Z

@Jefffrey ready to review.

alamb · 2026-01-07T22:02:14Z

I was literally about to sit down and have codex try to do this -- thank you @Standing-Man -- taking a look now

alamb

Looks good to me @Standing-Man -- thank you. THe only question I have is about the change of API to use Boxed results

datafusion/core/tests/user_defined/user_defined_scalar_functions.rs

datafusion/expr/src/planner.rs

Jefffrey · 2026-01-08T01:01:06Z

datafusion/expr/src/expr.rs

-        write!(f, " ({})", display_comma_separated(&self.items))?;
+        for item in &self.items {
+            write!(f, " ({item})")?;
+        }


I'm a bit curious on this change, it doesn't look right at first glance 🤔

If you take a second look, you’ll see that the display_comma_separated method is a private helper used to format ReplaceSelectItem. 😄

https://github.com/apache/datafusion-sqlparser-rs/blob/main/src/ast/query.rs#L960-L966

If we put two replace items in this test:

datafusion/datafusion/expr/src/expr.rs

Lines 3861 to 3868 in 102caeb

Some(PlannedReplaceSelectItem {

items: vec![ReplaceSelectElement {

expr: ast::Expr::Identifier(Ident::from("c1")),

column_name: Ident::from("a1"),

as_keyword: false

}],

planned_expressions: vec![]

}),

This new code will format the display like so:

* REPLACE (c1 a1) (c1 a1)

Which doesn't seem quite right?

Yes, you're right. the correct format display like:

* REPLACE (c1 a1, c1 a1)

i will update on next commit.

We should just reuse this function by removing its cfg guard:

datafusion/datafusion/expr/src/expr.rs

Lines 1271 to 1278 in a55b77e

#[cfg(not(feature = "sql"))]

pub fn display_comma_separated<T>(slice: &[T]) -> String

where

T: Display,

{

use itertools::Itertools;

slice.iter().map(|v| format!("{v}")).join(", ")

}

datafusion/sql/src/values.rs

datafusion/sql/src/query.rs

datafusion/sql/src/statement.rs

Signed-off-by: StandingMan <jmtangcs@gmail.com>

alamb

Thanks @Standing-Man and @Jefffrey

datafusion/sql/src/query.rs

datafusion/sql/src/statement.rs

Signed-off-by: StandingMan <jmtangcs@gmail.com>

Jefffrey

It is very tempting to not destructure the nested fields/enums because it makes the code less verbose. However, by doing so we miss fields that might be introduced in newer versions. These fields usually correspond to supporting more syntax. If we are unaware of this syntax, it means the SQL dialect we have will start accepting more and more syntax even if we don't do anything with the syntax.

I admit it might be painful and verbose to do it that way but I find its a very good way to use Rust's characteristics to help us catch this issues at compile time, instead of at runtime.

Jefffrey · 2026-01-09T02:28:01Z

datafusion/expr/src/expr.rs

-        write!(f, " ({})", display_comma_separated(&self.items))?;
+        for item in &self.items {
+            write!(f, " ({item})")?;
+        }


We should just reuse this function by removing its cfg guard:

datafusion/datafusion/expr/src/expr.rs

Lines 1271 to 1278 in a55b77e

#[cfg(not(feature = "sql"))]

pub fn display_comma_separated<T>(slice: &[T]) -> String

where

T: Display,

{

use itertools::Itertools;

slice.iter().map(|v| format!("{v}")).join(", ")

}

datafusion/sql/src/query.rs

Jefffrey · 2026-01-09T02:29:13Z

datafusion/sql/src/statement.rs

+                })),
+                ast::ColumnOption::PrimaryKey(PrimaryKeyConstraint {
+                    characteristics,
+                    ..


We're still ignoring fields here with the usage of ..

Jefffrey · 2026-01-09T02:30:52Z

datafusion/sql/src/statement.rs

-                func_desc,
-                ..
-            } => {
+            Statement::DropFunction(func) => {


We should be destructuring this like so

Statement::DropFunction(DropFunction { if_exists, func_desc, drop_behaviour, })

Jefffrey · 2026-01-09T02:31:39Z

datafusion/sql/src/statement.rs

-                    characteristics,
-                } => constraints.push(TableConstraint::Unique {
+                ast::ColumnOption::Unique(UniqueConstraint {
+                    characteristics, ..


We should be destructuring this not ignoring the fields with ..

Jefffrey · 2026-01-09T02:31:47Z

datafusion/sql/src/statement.rs

-                }),
-                ast::ColumnOption::Check(expr) => {
-                    constraints.push(TableConstraint::Check {
+                    ..


We should be destructuring this not ignoring the fields with ..

Jefffrey · 2026-01-09T02:31:52Z

datafusion/sql/src/statement.rs

+                        characteristics: *characteristics,
+                    }))
+                }
+                ast::ColumnOption::Check(CheckConstraint { name, expr, .. }) => {


We should be destructuring this not ignoring the fields with ..

Jefffrey · 2026-01-09T02:32:16Z

datafusion/sql/src/statement.rs

                or,
                limit,
-            } => {
+                ..


We should be destructuring this not ignoring the fields with ..

Jefffrey · 2026-01-09T02:32:19Z

datafusion/sql/src/statement.rs

                from,
                order_by,
                limit,
+                ..


We should be destructuring this not ignoring the fields with ..

Jefffrey · 2026-01-09T02:53:58Z

@Standing-Man could you please refrain from marking the comments as resolved? I see quite of few of my recent comments were marked as resolved even though no action was taken. Can you leave it to us to determine if a conversation is resolved, it makes it easier for us to review.

Signed-off-by: StandingMan <jmtangcs@gmail.com>

github-actions bot added sql SQL Planner logical-expr Logical plan and expressions core Core DataFusion crate labels Jan 7, 2026

chore(deps): Update sqlparser to 0.60

c2dd55b

Signed-off-by: StandingMan <jmtangcs@gmail.com>

Standing-Man force-pushed the sqlparser-upgrade branch from 0ea9df1 to c2dd55b Compare January 7, 2026 07:11

Standing-Man added 2 commits January 7, 2026 20:10

fix: fix the table alias and parameter on CreateTable

8b018d8

Signed-off-by: StandingMan <jmtangcs@gmail.com>

fix: fix the table constraints parser

563e8da

Signed-off-by: StandingMan <jmtangcs@gmail.com>

Merge branch 'main' into sqlparser-upgrade

0037086

alamb reviewed Jan 7, 2026

View reviewed changes

datafusion/core/tests/user_defined/user_defined_scalar_functions.rs Show resolved Hide resolved

datafusion/expr/src/planner.rs Show resolved Hide resolved

Jefffrey reviewed Jan 8, 2026

View reviewed changes

chore: add comment for Insert Token

b4a3189

Signed-off-by: StandingMan <jmtangcs@gmail.com>

Standing-Man requested review from Jefffrey and alamb January 8, 2026 05:54

fix: fix the DisPlay for

7f8cf18

Signed-off-by: StandingMan <jmtangcs@gmail.com>

alamb reviewed Jan 8, 2026

View reviewed changes

datafusion/sql/src/query.rs Show resolved Hide resolved

datafusion/sql/src/statement.rs Outdated Show resolved Hide resolved

enhance: explicitly destructur tableconstraints

5d0fed6

Signed-off-by: StandingMan <jmtangcs@gmail.com>

Jefffrey reviewed Jan 9, 2026

View reviewed changes

enhance: explicitly destructur tableconstraints

e00823c

Signed-off-by: StandingMan <jmtangcs@gmail.com>

Standing-Man force-pushed the sqlparser-upgrade branch from 1f5ceb7 to e00823c Compare January 9, 2026 03:00

	Some(PlannedReplaceSelectItem {
	items: vec![ReplaceSelectElement {
	expr: ast::Expr::Identifier(Ident::from("c1")),
	column_name: Ident::from("a1"),
	as_keyword: false
	}],
	planned_expressions: vec![]
	}),

	#[cfg(not(feature = "sql"))]
	pub fn display_comma_separated<T>(slice: &[T]) -> String
	where
	T: Display,
	{
	use itertools::Itertools;
	slice.iter().map(\|v\| format!("{v}")).join(", ")
	}

chore(deps): Update sqlparser to 0.60 #19672

Are you sure you want to change the base?

chore(deps): Update sqlparser to 0.60 #19672

Uh oh!

Conversation

Standing-Man commented Jan 7, 2026

Which issue does this PR close?

Rationale for this change

What changes are included in this PR?

Are these changes tested?

Are there any user-facing changes?

Uh oh!

Standing-Man commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Jefffrey commented Jan 7, 2026

Uh oh!

Standing-Man commented Jan 7, 2026

Uh oh!

alamb commented Jan 7, 2026

Uh oh!

alamb left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Standing-Man Jan 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

alamb left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Jefffrey left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Jefffrey commented Jan 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Standing-Man commented Jan 7, 2026 •

edited

Loading

Standing-Man Jan 8, 2026 •

edited

Loading