Skip to content

Commit 956b45f

Browse files
committed
feat: support byte string literal in bq
1 parent ca93941 commit 956b45f

File tree

4 files changed

+54
-0
lines changed

4 files changed

+54
-0
lines changed

src/ast/value.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ pub enum Value {
4141
/// See [Postgres docs](https://www.postgresql.org/docs/8.3/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS)
4242
/// for more details.
4343
EscapedStringLiteral(String),
44+
/// B'string value'
45+
SingleQuotedByteStringLiteral(String),
46+
/// B"string value"
47+
DoubleQuotedByteStringLiteral(String),
4448
/// N'string value'
4549
NationalStringLiteral(String),
4650
/// X'hex value'
@@ -65,6 +69,8 @@ impl fmt::Display for Value {
6569
Value::SingleQuotedString(v) => write!(f, "'{}'", escape_single_quote_string(v)),
6670
Value::DollarQuotedString(v) => write!(f, "{}", v),
6771
Value::EscapedStringLiteral(v) => write!(f, "E'{}'", escape_escaped_string(v)),
72+
Value::SingleQuotedByteStringLiteral(v) => write!(f, "B'{}'", v),
73+
Value::DoubleQuotedByteStringLiteral(v) => write!(f, "B\"{}\"", v),
6874
Value::NationalStringLiteral(v) => write!(f, "N'{}'", v),
6975
Value::HexStringLiteral(v) => write!(f, "X'{}'", v),
7076
Value::Boolean(v) => write!(f, "{}", v),

src/parser.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -779,6 +779,8 @@ impl<'a> Parser<'a> {
779779
| Token::SingleQuotedString(_)
780780
| Token::DoubleQuotedString(_)
781781
| Token::DollarQuotedString(_)
782+
| Token::SingleQuotedByteStringLiteral(_)
783+
| Token::DoubleQuotedByteStringLiteral(_)
782784
| Token::NationalStringLiteral(_)
783785
| Token::HexStringLiteral(_) => {
784786
self.prev_token();
@@ -4112,6 +4114,12 @@ impl<'a> Parser<'a> {
41124114
Token::SingleQuotedString(ref s) => Ok(Value::SingleQuotedString(s.to_string())),
41134115
Token::DoubleQuotedString(ref s) => Ok(Value::DoubleQuotedString(s.to_string())),
41144116
Token::DollarQuotedString(ref s) => Ok(Value::DollarQuotedString(s.clone())),
4117+
Token::SingleQuotedByteStringLiteral(ref s) => {
4118+
Ok(Value::SingleQuotedByteStringLiteral(s.clone()))
4119+
}
4120+
Token::DoubleQuotedByteStringLiteral(ref s) => {
4121+
Ok(Value::DoubleQuotedByteStringLiteral(s.clone()))
4122+
}
41154123
Token::NationalStringLiteral(ref s) => Ok(Value::NationalStringLiteral(s.to_string())),
41164124
Token::EscapedStringLiteral(ref s) => Ok(Value::EscapedStringLiteral(s.to_string())),
41174125
Token::HexStringLiteral(ref s) => Ok(Value::HexStringLiteral(s.to_string())),

src/tokenizer.rs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ pub enum Token {
5858
DoubleQuotedString(String),
5959
/// Dollar quoted string: i.e: $$string$$ or $tag_name$string$tag_name$
6060
DollarQuotedString(DollarQuotedString),
61+
/// Byte string literal: i.e: b'string' or B'string'
62+
SingleQuotedByteStringLiteral(String),
63+
/// Byte string literal: i.e: b"string" or B"string"
64+
DoubleQuotedByteStringLiteral(String),
6165
/// "National" string literal: i.e: N'string'
6266
NationalStringLiteral(String),
6367
/// "escaped" string literal, which are an extension to the SQL standard: i.e: e'first \n second' or E 'first \n second'
@@ -186,6 +190,8 @@ impl fmt::Display for Token {
186190
Token::SingleQuotedString(ref s) => write!(f, "'{}'", s),
187191
Token::DoubleQuotedString(ref s) => write!(f, "\"{}\"", s),
188192
Token::DollarQuotedString(ref s) => write!(f, "{}", s),
193+
Token::SingleQuotedByteStringLiteral(ref s) => write!(f, "B'{}'", s),
194+
Token::DoubleQuotedByteStringLiteral(ref s) => write!(f, "B\"{}\"", s),
189195
Token::NationalStringLiteral(ref s) => write!(f, "N'{}'", s),
190196
Token::EscapedStringLiteral(ref s) => write!(f, "E'{}'", s),
191197
Token::HexStringLiteral(ref s) => write!(f, "X'{}'", s),
@@ -493,6 +499,25 @@ impl<'a> Tokenizer<'a> {
493499
}
494500
Ok(Some(Token::Whitespace(Whitespace::Newline)))
495501
}
502+
// BigQuery uses b or B for byte string literal
503+
b @ 'B' | b @ 'b' => {
504+
chars.next(); // consume
505+
match chars.peek() {
506+
Some('\'') => {
507+
let s = self.tokenize_quoted_string(chars, '\'')?;
508+
Ok(Some(Token::SingleQuotedByteStringLiteral(s)))
509+
}
510+
Some('\"') => {
511+
let s = self.tokenize_quoted_string(chars, '\"')?;
512+
Ok(Some(Token::DoubleQuotedByteStringLiteral(s)))
513+
}
514+
_ => {
515+
// regular identifier starting with an "b" or "B"
516+
let s = self.tokenize_word(b, chars);
517+
Ok(Some(Token::make_word(&s, None)))
518+
}
519+
}
520+
}
496521
// Redshift uses lower case n for national string literal
497522
n @ 'N' | n @ 'n' => {
498523
chars.next(); // consume, to check the next char

tests/sqlparser_bigquery.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,21 @@ fn parse_literal_string() {
3333
);
3434
}
3535

36+
#[test]
37+
fn parse_byte_literal() {
38+
let sql = r#"SELECT B'abc', B"abc""#;
39+
let select = bigquery().verified_only_select(sql);
40+
assert_eq!(2, select.projection.len());
41+
assert_eq!(
42+
&Expr::Value(Value::SingleQuotedByteStringLiteral("abc".to_string())),
43+
expr_from_projection(&select.projection[0])
44+
);
45+
assert_eq!(
46+
&Expr::Value(Value::DoubleQuotedByteStringLiteral("abc".to_string())),
47+
expr_from_projection(&select.projection[1])
48+
);
49+
}
50+
3651
#[test]
3752
fn parse_table_identifiers() {
3853
fn test_table_ident(ident: &str, expected: Vec<Ident>) {

0 commit comments

Comments
 (0)