remove unescaper crate

JasonLi-cn · Feb 21, 2024 · d500eb3 · d500eb3
1 parent a7c0523
commit d500eb3
Show file tree

Hide file tree

Showing 5 changed files with 183 additions and 59 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -77,7 +77,6 @@ sqlparser = { version = "0.43.0", features = ["visitor"] }
 tempfile = "3"
 thiserror = "1.0.44"
 tokio = { version = "1.36", features = ["macros", "rt", "sync"] }
-unescaper = "0.1.4"
 url = "2.2"
 
 [profile.release]

diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock
diff --git a/datafusion/sql/Cargo.toml b/datafusion/sql/Cargo.toml
@@ -43,7 +43,6 @@ datafusion-common = { workspace = true }
 datafusion-expr = { workspace = true }
 log = { workspace = true }
 sqlparser = { workspace = true }
-unescaper = { workspace = true }
 
 [dev-dependencies]
 ctor = { workspace = true }

diff --git a/datafusion/sql/src/expr/value.rs b/datafusion/sql/src/expr/value.rs
@@ -52,9 +52,9 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
                     plan_err!("Invalid HexStringLiteral '{s}'")
                 }
             }
-            Value::EscapedStringLiteral(s) => match unescaper::unescape(&s) {
-                Ok(s) => Ok(lit(s)),
-                Err(_) => plan_err!("Invalid EscapedStringLiteral '{s}'"),
+            Value::EscapedStringLiteral(s) => match crate::utils::unescape(&s) {
+                Some(s) => Ok(lit(s)),
+                None => plan_err!("Invalid EscapedStringLiteral '{s}'"),
             },
             _ => plan_err!("Unsupported Value '{value:?}'"),
         }