From b9ca161ec49783640a45cea13bd56f3e1aa8346f Mon Sep 17 00:00:00 2001 From: Andriy Romanov Date: Wed, 3 Dec 2025 14:46:19 -0800 Subject: [PATCH 1/2] fix: support parsing parenthesized wildcard `(*)` --- src/parser/mod.rs | 9 +++++++++ tests/sqlparser_common.rs | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/parser/mod.rs b/src/parser/mod.rs index b2fa3b169..1c1a3d684 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -1222,6 +1222,15 @@ impl<'a> Parser<'a> { Token::Mul => { return Ok(Expr::Wildcard(AttachedToken(next_token))); } + // Handle parenthesized wildcard: (*) + Token::LParen => { + let inner_token = self.next_token(); + if inner_token.token == Token::Mul && self.peek_token().token == Token::RParen { + self.next_token(); // consume RParen + return Ok(Expr::Wildcard(AttachedToken(inner_token))); + } + // Not a (*), reset and fall through to parse_expr + } _ => (), }; diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs index ccad67e39..b9dab5de2 100644 --- a/tests/sqlparser_common.rs +++ b/tests/sqlparser_common.rs @@ -17905,3 +17905,22 @@ fn test_parse_set_session_authorization() { })) ); } + +#[test] +fn parse_select_distinct_parenthesized_wildcard() { + // Test SELECT DISTINCT(*) which uses a parenthesized wildcard + // The parentheses are syntactic sugar and get normalized to just * + let sql = "SELECT DISTINCT (*) FROM table1"; + let canonical = "SELECT DISTINCT * FROM table1"; + let select = all_dialects().verified_only_select_with_canonical(sql, canonical); + assert_eq!(select.distinct, Some(Distinct::Distinct)); + assert_eq!(select.projection.len(), 1); + assert!(matches!(select.projection[0], SelectItem::Wildcard(_))); + + // Also test without spaces: SELECT DISTINCT(*) + let sql_no_spaces = "SELECT DISTINCT(*) FROM table1"; + let select2 = all_dialects().verified_only_select_with_canonical(sql_no_spaces, canonical); + assert_eq!(select2.distinct, Some(Distinct::Distinct)); + assert_eq!(select2.projection.len(), 1); + assert!(matches!(select2.projection[0], SelectItem::Wildcard(_))); +} From c2a1d3ec66bce28bddb1354c769219b98d5bbfca Mon Sep 17 00:00:00 2001 From: Andriy Romanov Date: Thu, 4 Dec 2025 16:51:36 -0800 Subject: [PATCH 2/2] Refactoring based on comments --- src/parser/mod.rs | 10 ++++++---- tests/sqlparser_common.rs | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/parser/mod.rs b/src/parser/mod.rs index 1c1a3d684..1e633008b 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -1224,12 +1224,14 @@ impl<'a> Parser<'a> { } // Handle parenthesized wildcard: (*) Token::LParen => { - let inner_token = self.next_token(); - if inner_token.token == Token::Mul && self.peek_token().token == Token::RParen { + let [maybe_mul, maybe_rparen] = self.peek_tokens_ref(); + if maybe_mul.token == Token::Mul && maybe_rparen.token == Token::RParen { + let mul_token = self.next_token(); // consume Mul self.next_token(); // consume RParen - return Ok(Expr::Wildcard(AttachedToken(inner_token))); + return Ok(Expr::Wildcard(AttachedToken(mul_token))); } - // Not a (*), reset and fall through to parse_expr + // Not a (*), fall through to reset index and call parse_expr + self.prev_token(); } _ => (), }; diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs index b9dab5de2..83c321e07 100644 --- a/tests/sqlparser_common.rs +++ b/tests/sqlparser_common.rs @@ -17907,7 +17907,7 @@ fn test_parse_set_session_authorization() { } #[test] -fn parse_select_distinct_parenthesized_wildcard() { +fn parse_select_parenthesized_wildcard() { // Test SELECT DISTINCT(*) which uses a parenthesized wildcard // The parentheses are syntactic sugar and get normalized to just * let sql = "SELECT DISTINCT (*) FROM table1";