support generic dialect too (for DF)

sqlparser-rs · May 24, 2022 · 5d454e4 · 5d454e4
1 parent f46b07e
commit 5d454e4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/parser.rs b/src/parser.rs
@@ -496,7 +496,8 @@ impl<'a> Parser<'a> {
                     expr: Box::new(self.parse_subexpr(Self::PLUS_MINUS_PREC)?),
                 })
             }
-            Token::EscapedStringLiteral(_) if dialect_of!(self is PostgreSqlDialect) => {
+            Token::EscapedStringLiteral(_) if dialect_of!(self is PostgreSqlDialect | GenericDialect) =>
+            {
                 self.prev_token();
                 Ok(Expr::Value(self.parse_value()?))
             }
@@ -2602,7 +2603,9 @@ impl<'a> Parser<'a> {
         match self.next_token() {
             Token::Word(Word { value, keyword, .. }) if keyword == Keyword::NoKeyword => Ok(value),
             Token::SingleQuotedString(s) => Ok(s),
-            Token::EscapedStringLiteral(s) if dialect_of!(self is PostgreSqlDialect) => Ok(s),
+            Token::EscapedStringLiteral(s) if dialect_of!(self is PostgreSqlDialect | GenericDialect) => {
+                Ok(s)
+            }
             unexpected => self.expected("literal string", unexpected),
         }
     }

diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs
@@ -1472,7 +1472,7 @@ fn pg_and_generic() -> TestedDialects {
 fn parse_escaped_literal_string() {
     let sql =
         r#"SELECT E's1 \n s1', E's2 \\n s2', E's3 \\\n s3', E's4 \\\\n s4', E'\'', E'foo \\'"#;
-    let select = pg().verified_only_select(sql);
+    let select = pg_and_generic().verified_only_select(sql);
     assert_eq!(6, select.projection.len());
     assert_eq!(
         &Expr::Value(Value::EscapedStringLiteral("s1 \n s1".to_string())),
@@ -1501,7 +1501,10 @@ fn parse_escaped_literal_string() {
 
     let sql = r#"SELECT E'\'"#;
     assert_eq!(
-        pg().parse_sql_statements(sql).unwrap_err().to_string(),
+        pg_and_generic()
+            .parse_sql_statements(sql)
+            .unwrap_err()
+            .to_string(),
         "sql parser error: Unterminated encoded string literal at Line: 1, Column 8"
     );
 }