Generic: Fix quote escaping when displaying byte and raw string literals
diff --git a/src/ast/value.rs b/src/ast/value.rs index ad5dd1a..5b05af6 100644 --- a/src/ast/value.rs +++ b/src/ast/value.rs
@@ -278,12 +278,20 @@ Value::NationalQuoteDelimitedStringLiteral(v) => write!(f, "N{v}"), Value::HexStringLiteral(v) => write!(f, "X'{}'", escape_single_quote_string(v)), Value::Boolean(v) => write!(f, "{v}"), - Value::SingleQuotedByteStringLiteral(v) => write!(f, "B'{v}'"), - Value::DoubleQuotedByteStringLiteral(v) => write!(f, "B\"{v}\""), + Value::SingleQuotedByteStringLiteral(v) => { + write!(f, "B'{}'", escape_single_quote_string(v)) + } + Value::DoubleQuotedByteStringLiteral(v) => { + write!(f, "B\"{}\"", escape_double_quote_string(v)) + } Value::TripleSingleQuotedByteStringLiteral(v) => write!(f, "B'''{v}'''"), Value::TripleDoubleQuotedByteStringLiteral(v) => write!(f, r#"B"""{v}""""#), - Value::SingleQuotedRawStringLiteral(v) => write!(f, "R'{v}'"), - Value::DoubleQuotedRawStringLiteral(v) => write!(f, "R\"{v}\""), + Value::SingleQuotedRawStringLiteral(v) => { + write!(f, "R'{}'", escape_single_quote_string(v)) + } + Value::DoubleQuotedRawStringLiteral(v) => { + write!(f, "R\"{}\"", escape_double_quote_string(v)) + } Value::TripleSingleQuotedRawStringLiteral(v) => write!(f, "R'''{v}'''"), Value::TripleDoubleQuotedRawStringLiteral(v) => write!(f, r#"R"""{v}""""#), Value::Null => write!(f, "NULL"), @@ -729,3 +737,40 @@ "X'it''s'" ); } + +#[cfg(test)] +#[test] +fn test_byte_and_raw_string_literal_display_escaping() { + assert_eq!( + Value::SingleQuotedByteStringLiteral("'".to_string()).to_string(), + "B''''" + ); + assert_eq!( + Value::SingleQuotedByteStringLiteral("it's".to_string()).to_string(), + "B'it''s'" + ); + assert_eq!( + Value::DoubleQuotedByteStringLiteral("\"".to_string()).to_string(), + "B\"\"\"\"" + ); + assert_eq!( + Value::DoubleQuotedByteStringLiteral("it\"s".to_string()).to_string(), + "B\"it\"\"s\"" + ); + assert_eq!( + Value::SingleQuotedRawStringLiteral("'".to_string()).to_string(), + "R''''" + ); + assert_eq!( + Value::SingleQuotedRawStringLiteral("it's".to_string()).to_string(), + "R'it''s'" + ); + assert_eq!( + Value::DoubleQuotedRawStringLiteral("\"".to_string()).to_string(), + "R\"\"\"\"" + ); + assert_eq!( + Value::DoubleQuotedRawStringLiteral("it\"s".to_string()).to_string(), + "R\"it\"\"s\"" + ); +}
diff --git a/tests/sqlparser_bigquery.rs b/tests/sqlparser_bigquery.rs index 97f71cf..d6ae192 100644 --- a/tests/sqlparser_bigquery.rs +++ b/tests/sqlparser_bigquery.rs
@@ -2957,3 +2957,30 @@ bigquery().verified_stmt("FROM t SELECT a, b"); bigquery().verified_stmt("FROM t |> WHERE a > 1 |> SELECT a"); } + +#[test] +fn test_byte_and_raw_string_quote_escaping() { + let generic = TestedDialects::new(vec![Box::new(GenericDialect {})]); + generic.verified_stmt("SELECT B''''"); + generic.verified_stmt("SELECT B'it''s'"); + generic.verified_stmt("SELECT B\"\"\"\""); + generic.verified_stmt(r#"SELECT B"it""s""#); + generic.verified_stmt("SELECT R'it''s'"); + generic.verified_stmt(r#"SELECT R"it""s""#); + generic.verified_stmt("SELECT COUNSELECT AS name, B''''"); + + bigquery_and_generic().verified_stmt("SELECT B'it''s'"); + bigquery_and_generic().verified_stmt(r#"SELECT B"it""s""#); + bigquery_and_generic().verified_stmt("SELECT R'it''s'"); + bigquery_and_generic().verified_stmt(r#"SELECT R"it""s""#); + + let err = generic + .parse_sql_statements("SELECT B'unterminated") + .unwrap_err(); + assert_eq!( + ParserError::TokenizerError( + "Unterminated string literal at Line: 1, Column: 9".to_string(), + ), + err + ); +}
diff --git a/tests/sqlparser_mysql.rs b/tests/sqlparser_mysql.rs index 97f2137..ffa2e47 100644 --- a/tests/sqlparser_mysql.rs +++ b/tests/sqlparser_mysql.rs
@@ -5052,3 +5052,9 @@ mysql_and_generic().verified_expr("a IS NOT DISTINCT FROM b ->> 'k'") ); } + +#[test] +fn parse_bitstring_literal_escaping() { + mysql_and_generic().verified_stmt("SELECT B''''"); + mysql_and_generic().verified_stmt("SELECT B'it''s'"); +}
diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs index 0d08dc0..1f43772 100644 --- a/tests/sqlparser_postgres.rs +++ b/tests/sqlparser_postgres.rs
@@ -10031,3 +10031,9 @@ ParserError::ParserError("Expected: identifier, found: @".to_string()), ); } + +#[test] +fn parse_bitstring_literal_escaping() { + pg_and_generic().verified_stmt("SELECT B''''"); + pg_and_generic().verified_stmt("SELECT B'it''s'"); +}