From ee28658dfe529d6acf709e72a2facbf76cabb36e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 08:32:48 +0000 Subject: [PATCH 1/2] Update sqlparser requirement from 0.23 to 0.24 Updates the requirements on [sqlparser](https://github.com/sqlparser-rs/sqlparser-rs) to permit the latest version. - [Release notes](https://github.com/sqlparser-rs/sqlparser-rs/releases) - [Changelog](https://github.com/sqlparser-rs/sqlparser-rs/blob/main/CHANGELOG.md) - [Commits](https://github.com/sqlparser-rs/sqlparser-rs/compare/v0.23.0...v0.24.0) --- updated-dependencies: - dependency-name: sqlparser dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- datafusion/common/Cargo.toml | 2 +- datafusion/core/Cargo.toml | 2 +- datafusion/expr/Cargo.toml | 2 +- datafusion/sql/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/datafusion/common/Cargo.toml b/datafusion/common/Cargo.toml index c2c20f43cd46d..48bc61f5368f9 100644 --- a/datafusion/common/Cargo.toml +++ b/datafusion/common/Cargo.toml @@ -46,4 +46,4 @@ object_store = { version = "0.5.0", default-features = false, optional = true } ordered-float = "3.0" parquet = { version = "23.0.0", default-features = false, optional = true } pyo3 = { version = "0.17.1", optional = true } -sqlparser = "0.23" +sqlparser = "0.24" diff --git a/datafusion/core/Cargo.toml b/datafusion/core/Cargo.toml index f5f4350b072ae..1e338c5d106c5 100644 --- a/datafusion/core/Cargo.toml +++ b/datafusion/core/Cargo.toml @@ -85,7 +85,7 @@ pyo3 = { version = "0.17.1", optional = true } rand = "0.8" rayon = { version = "1.5", optional = true } smallvec = { version = "1.6", features = ["union"] } -sqlparser = "0.23" +sqlparser = "0.24" tempfile = "3" tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync", "fs", "parking_lot"] } tokio-stream = "0.1" diff --git a/datafusion/expr/Cargo.toml b/datafusion/expr/Cargo.toml index 101035a2ee379..e0b8e2d525321 100644 --- a/datafusion/expr/Cargo.toml +++ b/datafusion/expr/Cargo.toml @@ -38,4 +38,4 @@ path = "src/lib.rs" ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] } arrow = { version = "23.0.0", default-features = false } datafusion-common = { path = "../common", version = "12.0.0" } -sqlparser = "0.23" +sqlparser = "0.24" diff --git a/datafusion/sql/Cargo.toml b/datafusion/sql/Cargo.toml index 769d74a0c96ef..cf057a562aba4 100644 --- a/datafusion/sql/Cargo.toml +++ b/datafusion/sql/Cargo.toml @@ -40,4 +40,4 @@ unicode_expressions = [] arrow = { version = "23.0.0", default-features = false } datafusion-common = { path = "../common", version = "12.0.0" } datafusion-expr = { path = "../expr", version = "12.0.0" } -sqlparser = "0.23" +sqlparser = "0.24" From c800aae79a0b67ee777d8366e6a28c98d34de0fc Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Sat, 1 Oct 2022 07:11:03 -0400 Subject: [PATCH 2/2] Update for sqlparser changes --- datafusion/sql/src/planner.rs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/datafusion/sql/src/planner.rs b/datafusion/sql/src/planner.rs index a740d1af8f67e..a6b87a5acf334 100644 --- a/datafusion/sql/src/planner.rs +++ b/datafusion/sql/src/planner.rs @@ -152,6 +152,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> { verbose, statement, analyze, + format: _, describe_alias: _, } => self.explain_statement_to_plan(verbose, analyze, *statement), Statement::Query(query) => self.query_to_plan(*query, &mut HashMap::new()), @@ -364,7 +365,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> { } // create logical plan & pass backreferencing CTEs let logical_plan = self.query_to_plan_with_alias( - cte.query, + *cte.query, Some(cte_name.clone()), &mut ctes.clone(), outer_query_schema, @@ -1720,13 +1721,15 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> { ], }), - SQLExpr::Value(Value::Interval { + SQLExpr::Array(arr) => self.sql_array_literal(arr.elem, schema), + + SQLExpr::Interval { value, leading_field, leading_precision, last_field, fractional_seconds_precision, - }) => self.sql_interval_to_literal( + } => self.sql_interval_to_expr( *value, leading_field, leading_precision, @@ -1734,8 +1737,6 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> { fractional_seconds_precision, ), - SQLExpr::Array(arr) => self.sql_array_literal(arr.elem, schema), - SQLExpr::Identifier(id) => { if id.value.starts_with('@') { // TODO: figure out if ScalarVariables should be insensitive. @@ -2325,7 +2326,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> { Ok((fun, args)) } - fn sql_interval_to_literal( + fn sql_interval_to_expr( &self, value: SQLExpr, leading_field: Option, @@ -2697,7 +2698,7 @@ pub fn convert_simple_data_type(sql_type: &SQLDataType) -> Result { SQLDataType::UnsignedBigInt(_) => Ok(DataType::UInt64), SQLDataType::Float(_) => Ok(DataType::Float32), SQLDataType::Real => Ok(DataType::Float32), - SQLDataType::Double => Ok(DataType::Float64), + SQLDataType::Double | SQLDataType::DoublePrecision => Ok(DataType::Float64), SQLDataType::Char(_) | SQLDataType::Varchar(_) | SQLDataType::Text @@ -2723,6 +2724,8 @@ pub fn convert_simple_data_type(sql_type: &SQLDataType) -> Result { | SQLDataType::Array(_) | SQLDataType::Enum(_) | SQLDataType::Set(_) + | SQLDataType::MediumInt(_) + | SQLDataType::UnsignedMediumInt(_) | SQLDataType::Clob(_) => Err(DataFusionError::NotImplemented(format!( "Unsupported SQL type {:?}", sql_type