mirror of
https://github.com/apache/datafusion-sqlparser-rs.git
synced 2025-09-01 03:37:21 +00:00
Raise a TokenizerError when a delimited identifier is not closed before EOF
This commit is contained in:
parent
20637f0327
commit
ab88e02f0d
1 changed files with 22 additions and 2 deletions
|
@ -322,8 +322,14 @@ impl<'a> Tokenizer<'a> {
|
||||||
chars.next(); // consume the opening quote
|
chars.next(); // consume the opening quote
|
||||||
let quote_end = SQLWord::matching_end_quote(quote_start);
|
let quote_end = SQLWord::matching_end_quote(quote_start);
|
||||||
let s = peeking_take_while(chars, |ch| ch != quote_end);
|
let s = peeking_take_while(chars, |ch| ch != quote_end);
|
||||||
chars.next(); // TODO: raise error on EOF
|
if chars.next() == Some(quote_end) {
|
||||||
Ok(Some(Token::make_word(&s, Some(quote_start))))
|
Ok(Some(Token::make_word(&s, Some(quote_start))))
|
||||||
|
} else {
|
||||||
|
Err(TokenizerError(format!(
|
||||||
|
"Expected close delimiter '{}' before EOF.",
|
||||||
|
quote_end
|
||||||
|
)))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// numbers
|
// numbers
|
||||||
'0'..='9' => {
|
'0'..='9' => {
|
||||||
|
@ -743,6 +749,20 @@ mod tests {
|
||||||
compare(expected, tokens);
|
compare(expected, tokens);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn tokenize_mismatched_quotes() {
|
||||||
|
let sql = String::from("\"foo");
|
||||||
|
|
||||||
|
let dialect = GenericSqlDialect {};
|
||||||
|
let mut tokenizer = Tokenizer::new(&dialect, &sql);
|
||||||
|
assert_eq!(
|
||||||
|
tokenizer.tokenize(),
|
||||||
|
Err(TokenizerError(
|
||||||
|
"Expected close delimiter '\"' before EOF.".to_string(),
|
||||||
|
))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn tokenize_newlines() {
|
fn tokenize_newlines() {
|
||||||
let sql = String::from("line1\nline2\rline3\r\nline4\r");
|
let sql = String::from("line1\nline2\rline3\r\nline4\r");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue