7phs commented on code in PR #1576:
URL:
https://github.com/apache/datafusion-sqlparser-rs/pull/1576#discussion_r1873381184
##########
src/tokenizer.rs:
##########
@@ -1075,25 +1075,56 @@ impl<'a> Tokenizer<'a> {
Ok(Some(Token::DoubleQuotedString(s)))
}
// delimited (quoted) identifier
+ quote_start if self.dialect.is_delimited_identifier_start(ch)
=> {
+ let word = self.tokenize_quoted_identifier(quote_start,
chars)?;
+ Ok(Some(Token::make_word(&word, Some(quote_start))))
+ }
+ // special (quoted) identifier
quote_start
- if self.dialect.is_delimited_identifier_start(ch)
+ if self
+ .dialect
+ .is_nested_delimited_identifier_start(quote_start)
&& self
.dialect
-
.is_proper_identifier_inside_quotes(chars.peekable.clone()) =>
+
.nested_delimited_identifier(chars.peekable.clone())
+ .is_some() =>
{
- let error_loc = chars.location();
- chars.next(); // consume the opening quote
+ let (quote_start, nested_quote_start) = self
+ .dialect
+ .nested_delimited_identifier(chars.peekable.clone())
+ .unwrap();
+
+ let Some(nested_quote_start) = nested_quote_start else {
+ let word =
self.tokenize_quoted_identifier(quote_start, chars)?;
+ return Ok(Some(Token::make_word(&word,
Some(quote_start))));
+ };
+
+ let mut word = vec![];
let quote_end = Word::matching_end_quote(quote_start);
- let (s, last_char) = self.parse_quoted_ident(chars,
quote_end);
+ let nested_quote_end =
Word::matching_end_quote(nested_quote_start);
+ let error_loc = chars.location();
- if last_char == Some(quote_end) {
- Ok(Some(Token::make_word(&s, Some(quote_start))))
- } else {
- self.tokenizer_error(
+ chars.next(); // skip the first delimiter
+ word.push(peeking_take_while(chars, |ch|
ch.is_whitespace()));
+ if chars.peek() != Some(&nested_quote_start) {
+ return self.tokenizer_error(
+ error_loc,
+ format!("Expected nested delimiter
'{nested_quote_start}' before EOF."),
+ );
+ }
+ word.push(format!("{nested_quote_start}"));
Review Comment:
Updated
##########
src/tokenizer.rs:
##########
@@ -1075,25 +1075,56 @@ impl<'a> Tokenizer<'a> {
Ok(Some(Token::DoubleQuotedString(s)))
}
// delimited (quoted) identifier
+ quote_start if self.dialect.is_delimited_identifier_start(ch)
=> {
+ let word = self.tokenize_quoted_identifier(quote_start,
chars)?;
+ Ok(Some(Token::make_word(&word, Some(quote_start))))
+ }
+ // special (quoted) identifier
quote_start
- if self.dialect.is_delimited_identifier_start(ch)
+ if self
+ .dialect
+ .is_nested_delimited_identifier_start(quote_start)
&& self
.dialect
-
.is_proper_identifier_inside_quotes(chars.peekable.clone()) =>
+
.nested_delimited_identifier(chars.peekable.clone())
+ .is_some() =>
{
- let error_loc = chars.location();
- chars.next(); // consume the opening quote
+ let (quote_start, nested_quote_start) = self
+ .dialect
+ .nested_delimited_identifier(chars.peekable.clone())
+ .unwrap();
+
+ let Some(nested_quote_start) = nested_quote_start else {
+ let word =
self.tokenize_quoted_identifier(quote_start, chars)?;
+ return Ok(Some(Token::make_word(&word,
Some(quote_start))));
+ };
+
+ let mut word = vec![];
let quote_end = Word::matching_end_quote(quote_start);
- let (s, last_char) = self.parse_quoted_ident(chars,
quote_end);
+ let nested_quote_end =
Word::matching_end_quote(nested_quote_start);
+ let error_loc = chars.location();
- if last_char == Some(quote_end) {
- Ok(Some(Token::make_word(&s, Some(quote_start))))
- } else {
- self.tokenizer_error(
+ chars.next(); // skip the first delimiter
+ word.push(peeking_take_while(chars, |ch|
ch.is_whitespace()));
+ if chars.peek() != Some(&nested_quote_start) {
+ return self.tokenizer_error(
+ error_loc,
+ format!("Expected nested delimiter
'{nested_quote_start}' before EOF."),
+ );
+ }
+ word.push(format!("{nested_quote_start}"));
+
word.push(self.tokenize_quoted_identifier(nested_quote_end, chars)?);
+ word.push(format!("{nested_quote_end}"));
Review Comment:
Updated
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For additional commands, e-mail: github-h...@datafusion.apache.org
