Skip to content

build(deps): update sqlparser requirement from 0.30 to 0.32 w/ API update #5457

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 4 commits into from
Mar 8, 2023
Merged

build(deps): update sqlparser requirement from 0.30 to 0.32 w/ API update #5457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d872b7f
build(deps): update sqlparser requirement from 0.30 to 0.31
dependabot[bot] Mar 2, 2023
830e96c
fix APIs for new sqlparser apis
alamb Mar 2, 2023
4be0074
Update datafusion-cli
alamb Mar 2, 2023
e9c33e8
Update to sqlparser 0.32.0
alamb Mar 6, 2023
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
80 changes: 40 additions & 40 deletions datafusion-cli/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 datafusion/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ num_cpus = "1.13.0"
object_store = { version = "0.5.4", default-features = false, optional = true }
parquet = { version = "34.0.0", default-features = false, optional = true }
pyo3 = { version = "0.18.0", optional = true }
sqlparser = "0.30"
sqlparser = "0.32"
2 changes: 1 addition & 1 deletion datafusion/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ pin-project-lite = "^0.2.7"
rand = "0.8"
rayon = { version = "1.5", optional = true }
smallvec = { version = "1.6", features = ["union"] }
sqlparser = { version = "0.30", features = ["visitor"] }
sqlparser = { version = "0.32", features = ["visitor"] }
tempfile = "3"
tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync", "fs", "parking_lot"] }
tokio-stream = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion datafusion/expr/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ahash = { version = "0.8", default-features = false, features = ["runtime-rng"]
arrow = { version = "34.0.0", default-features = false }
datafusion-common = { path = "../common", version = "19.0.0" }
log = "^0.4"
sqlparser = "0.30"
sqlparser = "0.32"

[dev-dependencies]
ctor = "0.1.22"
Expand Down
2 changes: 1 addition & 1 deletion datafusion/sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ arrow-schema = "34.0.0"
datafusion-common = { path = "../common", version = "19.0.0" }
datafusion-expr = { path = "../expr", version = "19.0.0" }
log = "^0.4"
sqlparser = "0.30"
sqlparser = "0.32"

[dev-dependencies]
ctor = "0.1.22"
Expand Down
3 changes: 3 additions & 0 deletions datafusion/sql/src/planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
// adds/changes the `SQLDataType` the compiler will tell us on upgrade
// and avoid bugs like https://github.com/apache/arrow-datafusion/issues/3059
SQLDataType::Nvarchar(_)
| SQLDataType::JSON
| SQLDataType::Uuid
| SQLDataType::Binary(_)
| SQLDataType::Varbinary(_)
Expand All @@ -318,6 +319,8 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
// precision is not supported
| SQLDataType::Time(Some(_), _)
| SQLDataType::Dec(_)
| SQLDataType::BigNumeric(_)
| SQLDataType::BigDecimal(_)
| SQLDataType::Clob(_) => Err(DataFusionError::NotImplemented(format!(
"Unsupported SQL type {sql_type:?}"
))),
Expand Down
10 changes: 8 additions & 2 deletions datafusion/sql/src/select.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,11 +434,17 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
opt_exclude,
opt_except,
opt_rename,
opt_replace,
} = options;

if opt_exclude.is_some() || opt_except.is_some() || opt_rename.is_some() {
if opt_exclude.is_some()
|| opt_except.is_some()
|| opt_rename.is_some()
|| opt_replace.is_some()
{
Err(DataFusionError::NotImplemented(
"wildcard * with EXCLUDE, EXCEPT or RENAME not supported ".to_string(),
"wildcard * with EXCLUDE, EXCEPT, RENAME or REPLACE not supported "
.to_string(),
))
} else {
Ok(())
Expand Down
3 changes: 3 additions & 0 deletions datafusion/sql/src/statement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,9 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
| Value::UnQuotedString(_)
| Value::EscapedStringLiteral(_)
| Value::NationalStringLiteral(_)
| Value::SingleQuotedByteStringLiteral(_)
| Value::DoubleQuotedByteStringLiteral(_)
| Value::RawStringLiteral(_)
| Value::HexStringLiteral(_)
| Value::Null
| Value::Placeholder(_) => {
Expand Down