Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions src/tokenizer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -394,10 +394,21 @@ impl<'a> Tokenizer<'a> {
)
}
}
// numbers
'0'..='9' => {
// TODO: https://jakewheat.github.io/sql-overview/sql-2011-foundation-grammar.html#unsigned-numeric-literal
let s = peeking_take_while(chars, |ch| matches!(ch, '0'..='9' | '.'));
// numbers and period
'0'..='9' | '.' => {
let mut s = peeking_take_while(chars, |ch| matches!(ch, '0'..='9'));
// match one period
if let Some('.') = chars.peek() {
s.push('.');
chars.next();
}
s += &peeking_take_while(chars, |ch| matches!(ch, '0'..='9'));

// No number -> Token::Period
if s == "." {
return Ok(Some(Token::Period));
}

let long = if chars.peek() == Some(&'L') {
chars.next();
true
Expand Down Expand Up @@ -470,7 +481,6 @@ impl<'a> Tokenizer<'a> {
_ => Ok(Some(Token::Eq)),
}
}
'.' => self.consume_and_return(chars, Token::Period),
'!' => {
chars.next(); // consume
match chars.peek() {
Expand Down Expand Up @@ -667,6 +677,22 @@ mod tests {
compare(expected, tokens);
}

#[test]
fn tokenize_select_float() {
let sql = String::from("SELECT .1");
let dialect = GenericDialect {};
let mut tokenizer = Tokenizer::new(&dialect, &sql);
let tokens = tokenizer.tokenize().unwrap();

let expected = vec![
Token::make_keyword("SELECT"),
Token::Whitespace(Whitespace::Space),
Token::Number(String::from(".1"), false),
];

compare(expected, tokens);
}

#[test]
fn tokenize_scalar_function() {
let sql = String::from("SELECT sqrt(1)");
Expand Down
3 changes: 0 additions & 3 deletions tests/sqlparser_regression.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ macro_rules! tpch_tests {
fn $name() {
let dialect = GenericDialect {};
let res = Parser::parse_sql(&dialect, QUERIES[$value -1]);
// Ignore 6.sql
if $value != 6 {
assert!(res.is_ok());
}
}
)*
}
Expand Down