From 4f92baa8a1ec1df13cc2d6da204ba1c7f333ec79 Mon Sep 17 00:00:00 2001
From: Ayman Elkfrawy <ayman@sigmacomputing.com>
Date: Thu, 12 Dec 2024 11:00:51 -0800
Subject: [PATCH] Fix BigQuery hythenated ObjectName with numbers

---
 src/parser/mod.rs           |  4 +++-
 tests/sqlparser_bigquery.rs | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index 39ab2db24..1f9687526 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -8747,7 +8747,9 @@ impl<'a> Parser<'a> {
                             }
                             Token::Number(s, false) if s.chars().all(|c| c.is_ascii_digit()) => {
                                 ident.value.push_str(&s);
-                                true
+                                // If next token is period, then it is part of an ObjectName and we don't expect whitespace
+                                // after the number.
+                                !matches!(self.peek_token().token, Token::Period)
                             }
                             _ => {
                                 return self
diff --git a/tests/sqlparser_bigquery.rs b/tests/sqlparser_bigquery.rs
index 2be128a8c..387c77fea 100644
--- a/tests/sqlparser_bigquery.rs
+++ b/tests/sqlparser_bigquery.rs
@@ -1522,6 +1522,26 @@ fn parse_hyphenated_table_identifiers() {
         "SELECT * FROM foo-bar AS f JOIN baz-qux AS b ON f.id = b.id",
     );
 
+    assert_eq!(
+        bigquery()
+            .verified_only_select_with_canonical(
+                "select * from foo-123.bar",
+                "SELECT * FROM foo-123.bar"
+            )
+            .from[0]
+            .relation,
+        TableFactor::Table {
+            name: ObjectName(vec![Ident::new("foo-123"), Ident::new("bar")]),
+            alias: None,
+            args: None,
+            with_hints: vec![],
+            version: None,
+            partitions: vec![],
+            with_ordinality: false,
+            json_path: None,
+        }
+    );
+
     assert_eq!(
         bigquery()
             .verified_only_select_with_canonical(