Skip to content

Upgrade to sqlparser 0.61.0 #20177

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

Draft
alamb wants to merge 3 commits into
base: main
Choose a base branch
from
+103 −56
Draft

Upgrade to sqlparser 0.61.0 #20177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3e0e71
Update sqlparser to 0.61.0
alamb Feb 5, 2026
0461c5a
Update for new APIs
alamb Feb 5, 2026
d0373e8
cleanups
alamb Feb 6, 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
10 changes: 4 additions & 6 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.

5 changes: 4 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ regex = "1.12"
rstest = "0.26.1"
serde_json = "1"
sha2 = "^0.10.9"
sqlparser = { version = "0.60.0", default-features = false, features = ["std", "visitor"] }
sqlparser = { version = "0.61.0", default-features = false, features = ["std", "visitor"] }
strum = "0.27.2"
strum_macros = "0.27.2"
tempfile = "3"
Expand Down Expand Up @@ -275,3 +275,6 @@ incremental = false
inherits = "release"
debug = true
strip = false

[patch.crates-io]
sqlparser = { git = "https://github.com/apache/datafusion-sqlparser-rs.git", rev = "ce678990397f81c621d2df079ad552baae0cdfda" }
6 changes: 6 additions & 0 deletions datafusion/sql/src/expr/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,16 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
planner_context,
),

SQLExpr::Cast { array: true, .. } => {
not_impl_err!("`CAST(... AS type ARRAY`) not supported")
}

SQLExpr::Cast {
kind: CastKind::Cast | CastKind::DoubleColon,
expr,
data_type,
format,
array: false,
} => {
self.sql_cast_to_expr(*expr, &data_type, format, schema, planner_context)
}
Expand All @@ -281,6 +286,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
expr,
data_type,
format,
array: false,
} => {
if let Some(format) = format {
return not_impl_err!("CAST with format is not supported: {format}");
Expand Down
1 change: 1 addition & 0 deletions datafusion/sql/src/select.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
// Process distinct clause
let plan = match select.distinct {
None => Ok(plan),
Some(Distinct::All) => Ok(plan),
Some(Distinct::Distinct) => {
LogicalPlanBuilder::from(plan).distinct()?.build()
}
Expand Down
116 changes: 69 additions & 47 deletions datafusion/sql/src/statement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,26 +342,28 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
refresh_mode,
initialize,
require_user,
partition_of,
for_values,
}) => {
if temporary {
return not_impl_err!("Temporary tables not supported")?;
return not_impl_err!("Temporary tables not supported");
Copy link
Contributor Author

@alamb alamb Feb 6, 2026

Choose a reason for hiding this comment

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

This is a drive by cleanup -- no need to return and ? -- just return is fine

}
if external {
return not_impl_err!("External tables not supported")?;
return not_impl_err!("External tables not supported");
}
if global.is_some() {
return not_impl_err!("Global tables not supported")?;
return not_impl_err!("Global tables not supported");
}
if transient {
return not_impl_err!("Transient tables not supported")?;
return not_impl_err!("Transient tables not supported");
}
if volatile {
return not_impl_err!("Volatile tables not supported")?;
return not_impl_err!("Volatile tables not supported");
}
if hive_distribution != ast::HiveDistributionStyle::NONE {
return not_impl_err!(
"Hive distribution not supported: {hive_distribution:?}"
)?;
);
}
if hive_formats.is_some()
&& !matches!(
Expand All @@ -374,122 +376,126 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
})
)
{
return not_impl_err!(
"Hive formats not supported: {hive_formats:?}"
)?;
return not_impl_err!("Hive formats not supported: {hive_formats:?}");
}
if file_format.is_some() {
return not_impl_err!("File format not supported")?;
return not_impl_err!("File format not supported");
}
if location.is_some() {
return not_impl_err!("Location not supported")?;
return not_impl_err!("Location not supported");
}
if without_rowid {
return not_impl_err!("Without rowid not supported")?;
return not_impl_err!("Without rowid not supported");
}
if like.is_some() {
return not_impl_err!("Like not supported")?;
return not_impl_err!("Like not supported");
}
if clone.is_some() {
return not_impl_err!("Clone not supported")?;
return not_impl_err!("Clone not supported");
}
if comment.is_some() {
return not_impl_err!("Comment not supported")?;
return not_impl_err!("Comment not supported");
}
if on_commit.is_some() {
return not_impl_err!("On commit not supported")?;
return not_impl_err!("On commit not supported");
}
if on_cluster.is_some() {
return not_impl_err!("On cluster not supported")?;
return not_impl_err!("On cluster not supported");
}
if primary_key.is_some() {
return not_impl_err!("Primary key not supported")?;
return not_impl_err!("Primary key not supported");
}
if order_by.is_some() {
return not_impl_err!("Order by not supported")?;
return not_impl_err!("Order by not supported");
}
if partition_by.is_some() {
return not_impl_err!("Partition by not supported")?;
return not_impl_err!("Partition by not supported");
}
if cluster_by.is_some() {
return not_impl_err!("Cluster by not supported")?;
return not_impl_err!("Cluster by not supported");
}
if clustered_by.is_some() {
return not_impl_err!("Clustered by not supported")?;
return not_impl_err!("Clustered by not supported");
}
if strict {
return not_impl_err!("Strict not supported")?;
return not_impl_err!("Strict not supported");
}
if copy_grants {
return not_impl_err!("Copy grants not supported")?;
return not_impl_err!("Copy grants not supported");
}
if enable_schema_evolution.is_some() {
return not_impl_err!("Enable schema evolution not supported")?;
return not_impl_err!("Enable schema evolution not supported");
}
if change_tracking.is_some() {
return not_impl_err!("Change tracking not supported")?;
return not_impl_err!("Change tracking not supported");
}
if data_retention_time_in_days.is_some() {
return not_impl_err!("Data retention time in days not supported")?;
return not_impl_err!("Data retention time in days not supported");
}
if max_data_extension_time_in_days.is_some() {
return not_impl_err!(
"Max data extension time in days not supported"
)?;
);
}
if default_ddl_collation.is_some() {
return not_impl_err!("Default DDL collation not supported")?;
return not_impl_err!("Default DDL collation not supported");
}
if with_aggregation_policy.is_some() {
return not_impl_err!("With aggregation policy not supported")?;
return not_impl_err!("With aggregation policy not supported");
}
if with_row_access_policy.is_some() {
return not_impl_err!("With row access policy not supported")?;
return not_impl_err!("With row access policy not supported");
}
if with_tags.is_some() {
return not_impl_err!("With tags not supported")?;
return not_impl_err!("With tags not supported");
}
if iceberg {
return not_impl_err!("Iceberg not supported")?;
return not_impl_err!("Iceberg not supported");
}
if external_volume.is_some() {
return not_impl_err!("External volume not supported")?;
return not_impl_err!("External volume not supported");
}
if base_location.is_some() {
return not_impl_err!("Base location not supported")?;
return not_impl_err!("Base location not supported");
}
if catalog.is_some() {
return not_impl_err!("Catalog not supported")?;
return not_impl_err!("Catalog not supported");
}
if catalog_sync.is_some() {
return not_impl_err!("Catalog sync not supported")?;
return not_impl_err!("Catalog sync not supported");
}
if storage_serialization_policy.is_some() {
return not_impl_err!("Storage serialization policy not supported")?;
return not_impl_err!("Storage serialization policy not supported");
}
if inherits.is_some() {
return not_impl_err!("Table inheritance not supported")?;
return not_impl_err!("Table inheritance not supported");
}
if dynamic {
return not_impl_err!("Dynamic tables not supported")?;
return not_impl_err!("Dynamic tables not supported");
}
if version.is_some() {
return not_impl_err!("Version not supported")?;
return not_impl_err!("Version not supported");
}
if target_lag.is_some() {
return not_impl_err!("Target lag not supported")?;
return not_impl_err!("Target lag not supported");
}
if warehouse.is_some() {
return not_impl_err!("Warehouse not supported")?;
return not_impl_err!("Warehouse not supported");
}
if refresh_mode.is_some() {
return not_impl_err!("Refresh mode not supported")?;
return not_impl_err!("Refresh mode not supported");
}
if initialize.is_some() {
return not_impl_err!("Initialize not supported")?;
return not_impl_err!("Initialize not supported");
}
if require_user {
return not_impl_err!("Require user not supported")?;
return not_impl_err!("Require user not supported");
}
if partition_of.is_some() {
return not_impl_err!("PARTITION OF not supported");
}
if for_values.is_some() {
return not_impl_err!("PARTITION OF .. FOR VALUES .. not supported");
}
// Merge inline constraints and existing constraints
let mut all_constraints = constraints;
Expand Down Expand Up @@ -989,7 +995,8 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
has_table_keyword,
settings,
format_clause,
insert_token: _insert_token, // record the location the `INSERT` token
insert_token: _, // record the location the `INSERT` token
optimizer_hint,
}) => {
let table_name = match table {
TableObject::TableName(table_name) => table_name,
Expand Down Expand Up @@ -1045,6 +1052,9 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
if format_clause.is_some() {
plan_err!("Inserts with format clause not supported")?;
}
if optimizer_hint.is_some() {
plan_err!("Optimizer hints not supported")?;
}
// optional keywords don't change behavior
let _ = into;
let _ = has_table_keyword;
Expand All @@ -1059,6 +1069,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
or,
limit,
update_token: _,
optimizer_hint,
}) => {
let from_clauses =
from.map(|update_table_from_kind| match update_table_from_kind {
Expand All @@ -1079,6 +1090,9 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
if limit.is_some() {
return not_impl_err!("Update-limit clause not supported")?;
}
if optimizer_hint.is_some() {
plan_err!("Optimizer hints not supported")?;
}
self.update_to_plan(table, &assignments, update_from, selection)
}

Expand All @@ -1091,6 +1105,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
order_by,
limit,
delete_token: _,
optimizer_hint,
}) => {
if !tables.is_empty() {
plan_err!("DELETE <TABLE> not supported")?;
Expand All @@ -1111,6 +1126,9 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
if limit.is_some() {
plan_err!("Delete-limit clause not yet supported")?;
}
if optimizer_hint.is_some() {
plan_err!("Optimizer hints not supported")?;
}

let table_name = self.get_delete_target(from)?;
self.delete_to_plan(&table_name, selection)
Expand Down Expand Up @@ -1397,6 +1415,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
cascade,
on_cluster,
table,
if_exists,
}) => {
let _ = table; // Support TRUNCATE TABLE and TRUNCATE syntax
if table_names.len() != 1 {
Expand Down Expand Up @@ -1425,6 +1444,9 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
if on_cluster.is_some() {
return not_impl_err!("TRUNCATE with ON CLUSTER is not supported");
}
if if_exists {
return not_impl_err!("TRUNCATE .. WITH EXISTS is not supported");
}
let table = self.object_name_to_table_reference(target.name.clone())?;
let source = self.context_provider.get_table_source(table.clone())?;

Expand Down
7 changes: 5 additions & 2 deletions datafusion/sql/src/unparser/ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,9 @@ impl SelectBuilder {
}
pub fn build(&self) -> Result<ast::Select, BuilderError> {
Ok(ast::Select {
optimizer_hint: None,
distinct: self.distinct.clone(),
select_modifiers: None,
top_before_distinct: false,
top: self.top.clone(),
projection: self.projection.clone().unwrap_or_default(),
Expand All @@ -340,12 +342,12 @@ impl SelectBuilder {
named_window: self.named_window.clone(),
qualify: self.qualify.clone(),
value_table_mode: self.value_table_mode,
connect_by: None,
connect_by: Vec::new(),
window_before_qualify: false,
prewhere: None,
select_token: AttachedToken::empty(),
flavor: match self.flavor {
Some(ref value) => value.clone(),
Some(ref value) => *value,
None => return Err(Into::into(UninitializedFieldError::from("flavor"))),
},
exclude: None,
Expand Down Expand Up @@ -608,6 +610,7 @@ impl DerivedRelationBuilder {
}
},
alias: self.alias.clone(),
sample: None,
})
}
fn create_empty() -> Self {
Expand Down
1 change: 1 addition & 0 deletions datafusion/sql/src/unparser/dialect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ impl PostgreSqlDialect {
kind: ast::CastKind::Cast,
expr: Box::new(expr.clone()),
data_type: ast::DataType::Numeric(ast::ExactNumberInfo::None),
array: false,
format: None,
};
}
Expand Down
Loading