use sqlparser 0.21

apache · Aug 19, 2022 · 932d990 · 932d990
1 parent 292ff5b
commit 932d990
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 13 deletions.
diff --git a/datafusion/common/Cargo.toml b/datafusion/common/Cargo.toml
@@ -47,4 +47,4 @@ ordered-float = "3.0"
 parquet = { version = "20.0.0", features = ["arrow"], optional = true }
 pyo3 = { version = "0.16", optional = true }
 serde_json = "1.0"
-sqlparser = { git = "https://github.com/sqlparser-rs/sqlparser-rs", rev = "42c5d43b45d3e7a573ac24dd5c927c43bbd3768c" }
+sqlparser = "0.21"
diff --git a/datafusion/core/Cargo.toml b/datafusion/core/Cargo.toml
@@ -85,7 +85,7 @@ pyo3 = { version = "0.16", optional = true }
 rand = "0.8"
 rayon = { version = "1.5", optional = true }
 smallvec = { version = "1.6", features = ["union"] }
-sqlparser = { git = "https://github.com/sqlparser-rs/sqlparser-rs", rev = "42c5d43b45d3e7a573ac24dd5c927c43bbd3768c" }
+sqlparser = "0.21"
 tempfile = "3"
 tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync", "fs", "parking_lot"] }
 tokio-stream = "0.1"

diff --git a/datafusion/core/tests/sql/expr.rs b/datafusion/core/tests/sql/expr.rs
@@ -1322,9 +1322,6 @@ async fn nested_subquery() -> Result<()> {
 }
 
 #[tokio::test]
-#[ignore]
-// this will be re-instated once we are using a later rev of sqlparser that has a fix for this
-// regression - see https://github.com/apache/arrow-datafusion/issues/3192 for more info
 async fn like_nlike_with_null_lt() {
     let ctx = SessionContext::new();
     let sql = "SELECT column1 like NULL as col_null, NULL like column1 as null_col from (values('a'), ('b'), (NULL)) as t";

diff --git 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 = "20.0.0", features = ["prettyprint"] }
 datafusion-common = { path = "../common", version = "11.0.0" }
-sqlparser = { git = "https://github.com/sqlparser-rs/sqlparser-rs", rev = "42c5d43b45d3e7a573ac24dd5c927c43bbd3768c" }
+sqlparser = "0.21"
diff --git a/datafusion/sql/Cargo.toml b/datafusion/sql/Cargo.toml
@@ -42,5 +42,5 @@ arrow = { version = "20.0.0", features = ["prettyprint"] }
 datafusion-common = { path = "../common", version = "11.0.0" }
 datafusion-expr = { path = "../expr", version = "11.0.0" }
 hashbrown = "0.12"
-sqlparser = { git = "https://github.com/sqlparser-rs/sqlparser-rs", rev = "42c5d43b45d3e7a573ac24dd5c927c43bbd3768c" }
+sqlparser = "0.21"
 tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync", "fs", "parking_lot"] }
diff --git a/datafusion/sql/src/planner.rs b/datafusion/sql/src/planner.rs
@@ -1941,12 +1941,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
                         Ok(Expr::BinaryExpr {
                             left: Box::new(self.sql_expr_to_logical_expr(*expr, schema, ctes)?),
                             op: if negated { Operator::NotLike } else { Operator::Like },
-                            right: match *pattern {
-                                Value::SingleQuotedString(s) | Value::DoubleQuotedString(s) => {
-                                    Ok(Box::new(Expr::Literal(ScalarValue::Utf8(Some(s)))))
-                                }
-                                _ => Err(DataFusionError::NotImplemented("Unsupported syntax for LIKE pattern ".to_string()))
-                            }?
+                            right: Box::new(self.sql_expr_to_logical_expr(*pattern, schema, ctes)?),
                         })
                     }
                 }