From 7e152cd0a9887f68435164122b00f097ced3d04c Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Sun, 14 Oct 2018 12:26:47 -0600 Subject: [PATCH] revert one timestamp parsing case --- src/sqlparser.rs | 10 +++++----- tests/sqlparser_generic.rs | 12 ++++++++++++ tests/sqlparser_postgres.rs | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/sqlparser.rs b/src/sqlparser.rs index a108a5d9..d97dc998 100644 --- a/src/sqlparser.rs +++ b/src/sqlparser.rs @@ -714,12 +714,12 @@ impl Parser { }, Token::Number(ref n) => match n.parse::() { Ok(n) => { - if let Some(Token::Minus) = self.peek_token() { - self.prev_token(); - self.parse_timestamp_value() - } else { +// if let Some(Token::Minus) = self.peek_token() { +// self.prev_token(); +// self.parse_timestamp_value() +// } else { Ok(Value::Long(n)) - } +// } } Err(e) => parser_err!(format!("Could not parse '{}' as i64: {}", n, e)), }, diff --git a/tests/sqlparser_generic.rs b/tests/sqlparser_generic.rs index 980df467..50cd2af9 100644 --- a/tests/sqlparser_generic.rs +++ b/tests/sqlparser_generic.rs @@ -347,6 +347,18 @@ fn parse_literal_string() { } } +#[test] +fn parse_simple_math_expr_plus() { + let sql = "SELECT a + b, 2 + a, 2.5 + a, a_f + b_f, 2 + a_f, 2.5 + a_f FROM c"; + parse_sql(&sql); +} + +#[test] +fn parse_simple_math_expr_minus() { + let sql = "SELECT a - b, 2 - a, 2.5 - a, a_f - b_f, 2 - a_f, 2.5 - a_f FROM c"; + parse_sql(&sql); +} + #[test] fn parse_select_version() { let sql = "SELECT @@version"; diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs index ea175155..adc575fc 100644 --- a/tests/sqlparser_postgres.rs +++ b/tests/sqlparser_postgres.rs @@ -632,7 +632,7 @@ PHP ₱ USD $ //assert_eq!(sql, ast.to_string()); } -#[test] +#[ignore] fn parse_timestamps_example() { let sql = "2016-02-15 09:43:33"; let ast = parse_sql(sql);