BigQuery: Allow tokens after a hyphenated identifier ending in a number

fuzz/fuzz_seeds/bigquery_2620_hyphen_numeric_boundary.sql

@@ -0,0 +1,5 @@
+SELECT * FROM project-1.dataset-2.table-3 WHERE x = 1;
+SELECT * FROM foo-1;
+SELECT * FROM (SELECT 1 FROM foo-1);
+SELECT * FROM foo-1, bar-2;
+CREATE TABLE t-1 (a INT64)

src/parser/mod.rs

@@ -14241,11 +14241,10 @@ impl<'a> Parser<'a> {
                         }
                     }
 
-                    // If the last segment was a number, we must check that it's followed by whitespace,
-                    // otherwise foo-123a will be parsed as `foo-123` with the alias `a`.
+                    // A word or number butted onto a trailing number glues into it, as in `foo-123a`.
                     if requires_whitespace {
-                        let token = self.next_token();
-                        if !matches!(token.token, Token::EOF | Token::Whitespace(_)) {
+                        let token = self.peek_token_no_skip();
+                        if matches!(token.token, Token::Word(_) | Token::Number(_, false)) {
                             return self
                                 .expected("whitespace following hyphenated identifier", token);
                         }

tests/sqlparser_bigquery.rs

@@ -3001,3 +3001,38 @@ fn test_byte_and_raw_string_quote_escaping() {
         err
     );
 }
+
+#[test]
+fn parse_hyphenated_identifier_after_numeric_segment() {
+    bigquery().verified_stmt("SELECT * FROM project-1.dataset-2.table-3 WHERE x = 1");
+    bigquery().verified_stmt("SELECT * FROM foo-1 AS t");
+    bigquery().verified_stmt("SELECT * FROM foo-1 JOIN bar-2 USING(id)");
+    bigquery().verified_stmt("SELECT * FROM foo-1, bar-2");
+    bigquery().verified_stmt("DELETE FROM foo-1 WHERE a = 1");
+    bigquery().verified_stmt("UPDATE foo-1 SET a = 1");
+    bigquery().verified_stmt("CREATE TABLE t-1 (a INT64)");
+    bigquery().verified_stmt("CREATE TABLE ship_mo-29 (a INT64)");
+    bigquery().one_statement_parses_to("SELECT * FROM foo-1;", "SELECT * FROM foo-1");
+    bigquery().verified_stmt("SELECT * FROM (SELECT 1 FROM foo-1)");
+    bigquery().one_statement_parses_to("CREATE TABLE t-1(a INT64)", "CREATE TABLE t-1 (a INT64)");
+
+    let err = bigquery()
+        .parse_sql_statements("SELECT * FROM foo-123a")
+        .unwrap_err();
+    assert_eq!(
+        ParserError::ParserError(
+            "Expected: whitespace following hyphenated identifier, found: a".to_string(),
+        ),
+        err
+    );
+
+    let err = bigquery()
+        .parse_sql_statements("SELECT * FROM foo-1`x`")
+        .unwrap_err();
+    assert_eq!(
+        ParserError::ParserError(
+            "Expected: whitespace following hyphenated identifier, found: `x`".to_string(),
+        ),
+        err
+    );
+}