You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datafusion.apache.org by gi...@apache.org on 2026/04/18 03:58:33 UTC

(datafusion-sqlparser-rs) branch gh-readonly-queue/main/pr-2291-9a70c42d036f709ac437658c4cd8fa627b3eff5d created (now 19a7468c)

This is an automated email from the ASF dual-hosted git repository.

github-merge-queue[bot] pushed a change to branch gh-readonly-queue/main/pr-2291-9a70c42d036f709ac437658c4cd8fa627b3eff5d
in repository https://gitbox.apache.org/repos/asf/datafusion-sqlparser-rs.git


      at 19a7468c Track `Parens<T>`'s span (#2291)

This branch includes the following new commits:

     new 19a7468c Track `Parens<T>`'s span (#2291)

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datafusion.apache.org
For additional commands, e-mail: commits-help@datafusion.apache.org


(datafusion-sqlparser-rs) 01/01: Track `Parens`'s span (#2291)

Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/main/pr-2291-9a70c42d036f709ac437658c4cd8fa627b3eff5d
in repository https://gitbox.apache.org/repos/asf/datafusion-sqlparser-rs.git

commit 19a7468cfe69f03934bc2619a65b4ca2bfcaae9a
Author: xitep <xi...@users.noreply.github.com>
AuthorDate: Sat Apr 18 05:58:04 2026 +0200

    Track `Parens<T>`'s span (#2291)
---
 src/ast/mod.rs                | 41 ++++++++++++++++++++++++++++++++++++++-
 src/ast/query.rs              |  2 +-
 src/ast/spans.rs              | 29 +++++++++++++++++-----------
 src/parser/mod.rs             | 19 +++++++++---------
 tests/sqlparser_bigquery.rs   | 13 ++++++++-----
 tests/sqlparser_common.rs     | 13 ++++++++-----
 tests/sqlparser_databricks.rs |  8 ++++----
 tests/sqlparser_mysql.rs      | 45 +++++++++++++++++++++++--------------------
 tests/sqlparser_postgres.rs   | 16 +++++++--------
 9 files changed, 120 insertions(+), 66 deletions(-)

diff --git a/src/ast/mod.rs b/src/ast/mod.rs
index c10b383e..886bea26 100644
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -30,7 +30,7 @@ use helpers::{
 };
 
 use core::cmp::Ordering;
-use core::ops::Deref;
+use core::ops::{Deref, DerefMut};
 use core::{
     fmt::{self, Display},
     hash,
@@ -200,6 +200,45 @@ fn format_statement_list(f: &mut fmt::Formatter, statements: &[Statement]) -> fm
     write!(f, ";")
 }
 
+/// A item `T` enclosed in a pair of parentheses
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
+pub struct Parens<T> {
+    /// the opening parenthesis token, i.e. `(`
+    pub opening_token: AttachedToken,
+    /// content enclosed in parentheses
+    pub content: T,
+    /// the closing parenthesis token, i.e. `)`
+    pub closing_token: AttachedToken,
+}
+
+impl<T> Parens<T> {
+    /// Constructor wrapping `content` into `Parens` with an empty span;
+    /// useful for testing purposes.
+    pub fn with_empty_span(content: T) -> Self {
+        Self {
+            opening_token: AttachedToken::empty(),
+            content,
+            closing_token: AttachedToken::empty(),
+        }
+    }
+}
+
+impl<T> Deref for Parens<T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        &self.content
+    }
+}
+
+impl<T> DerefMut for Parens<T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.content
+    }
+}
+
 /// An identifier, decomposed into its value or character data and the quote style.
 #[derive(Debug, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
diff --git a/src/ast/query.rs b/src/ast/query.rs
index 8e6f654e..7ffd6407 100644
--- a/src/ast/query.rs
+++ b/src/ast/query.rs
@@ -3634,7 +3634,7 @@ pub struct Values {
     /// <https://dev.mysql.com/doc/refman/9.2/en/insert.html>
     pub value_keyword: bool,
     /// The list of rows, each row is a list of expressions.
-    pub rows: Vec<Vec<Expr>>,
+    pub rows: Vec<Parens<Vec<Expr>>>,
 }
 
 impl fmt::Display for Values {
diff --git a/src/ast/spans.rs b/src/ast/spans.rs
index e2a610c0..adc1443f 100644
--- a/src/ast/spans.rs
+++ b/src/ast/spans.rs
@@ -41,13 +41,13 @@ use super::{
     MatchRecognizePattern, Measure, Merge, MergeAction, MergeClause, MergeInsertExpr,
     MergeInsertKind, MergeUpdateExpr, NamedParenthesizedList, NamedWindowDefinition, ObjectName,
     ObjectNamePart, Offset, OnConflict, OnConflictAction, OnInsert, OpenStatement, OrderBy,
-    OrderByExpr, OrderByKind, OutputClause, Partition, PartitionBoundValue, PivotValueSource,
-    ProjectionSelect, Query, RaiseStatement, RaiseStatementValue, ReferentialAction,
-    RenameSelectItem, ReplaceSelectElement, ReplaceSelectItem, Select, SelectInto, SelectItem,
-    SetExpr, SqlOption, Statement, Subscript, SymbolDefinition, TableAlias, TableAliasColumnDef,
-    TableConstraint, TableFactor, TableObject, TableOptionsClustered, TableWithJoins, Update,
-    UpdateTableFromKind, Use, Values, ViewColumnDef, WhileStatement, WildcardAdditionalOptions,
-    With, WithFill,
+    OrderByExpr, OrderByKind, OutputClause, Parens, Partition, PartitionBoundValue,
+    PivotValueSource, ProjectionSelect, Query, RaiseStatement, RaiseStatementValue,
+    ReferentialAction, RenameSelectItem, ReplaceSelectElement, ReplaceSelectItem, Select,
+    SelectInto, SelectItem, SetExpr, SqlOption, Statement, Subscript, SymbolDefinition, TableAlias,
+    TableAliasColumnDef, TableConstraint, TableFactor, TableObject, TableOptionsClustered,
+    TableWithJoins, Update, UpdateTableFromKind, Use, Values, ViewColumnDef, WhileStatement,
+    WildcardAdditionalOptions, With, WithFill,
 };
 
 /// Given an iterator of spans, return the [Span::union] of all spans.
@@ -106,6 +106,12 @@ impl Spanned for TokenWithSpan {
     }
 }
 
+impl<T> Spanned for Parens<T> {
+    fn span(&self) -> Span {
+        self.opening_token.0.span.union(&self.closing_token.0.span)
+    }
+}
+
 impl Spanned for Query {
     fn span(&self) -> Span {
         let Query {
@@ -239,10 +245,11 @@ impl Spanned for Values {
             rows,
         } = self;
 
-        union_spans(
-            rows.iter()
-                .map(|row| union_spans(row.iter().map(|expr| expr.span()))),
-        )
+        match &rows[..] {
+            [] => Span::empty(),
+            [f] => f.span(),
+            [f, .., l] => f.span().union(&l.span()),
+        }
     }
 }
 
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index caac20e5..7501919a 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -19028,16 +19028,15 @@ impl<'a> Parser<'a> {
             if parser.parse_keyword(Keyword::ROW) {
                 explicit_row = true;
             }
-
-            parser.expect_token(&Token::LParen)?;
-            if allow_empty && parser.peek_token().token == Token::RParen {
-                parser.next_token();
-                Ok(vec![])
-            } else {
-                let exprs = parser.parse_comma_separated(Parser::parse_expr)?;
-                parser.expect_token(&Token::RParen)?;
-                Ok(exprs)
-            }
+            Ok(Parens {
+                opening_token: parser.expect_token(&Token::LParen)?.into(),
+                content: if allow_empty && parser.peek_token_ref().token == Token::RParen {
+                    vec![]
+                } else {
+                    parser.parse_comma_separated(Parser::parse_expr)?
+                },
+                closing_token: parser.expect_token(&Token::RParen)?.into(),
+            })
         })?;
         Ok(Values {
             explicit_row,
diff --git a/tests/sqlparser_bigquery.rs b/tests/sqlparser_bigquery.rs
index 79db34b0..4bdb54f7 100644
--- a/tests/sqlparser_bigquery.rs
+++ b/tests/sqlparser_bigquery.rs
@@ -1821,7 +1821,10 @@ fn parse_merge() {
         kind: MergeInsertKind::Values(Values {
             value_keyword: false,
             explicit_row: false,
-            rows: vec![vec![Expr::value(number("1")), Expr::value(number("2"))]],
+            rows: vec![Parens::with_empty_span(vec![
+                Expr::value(number("1")),
+                Expr::value(number("2")),
+            ])],
         }),
         insert_predicate: None,
     });
@@ -2003,10 +2006,10 @@ fn parse_merge() {
                             kind: MergeInsertKind::Values(Values {
                                 value_keyword: false,
                                 explicit_row: false,
-                                rows: vec![vec![
+                                rows: vec![Parens::with_empty_span(vec![
                                     Expr::value(number("1")),
                                     Expr::Identifier(Ident::new("DEFAULT")),
-                                ]]
+                                ])]
                             }),
                             insert_predicate: None,
                         })
@@ -2022,10 +2025,10 @@ fn parse_merge() {
                             kind: MergeInsertKind::Values(Values {
                                 value_keyword: false,
                                 explicit_row: false,
-                                rows: vec![vec![
+                                rows: vec![Parens::with_empty_span(vec![
                                     Expr::value(number("1")),
                                     Expr::Identifier(Ident::new("DEFAULT")),
-                                ]]
+                                ])]
                             }),
                             insert_predicate: None,
                         })
diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs
index 567d04bb..aaede9c8 100644
--- a/tests/sqlparser_common.rs
+++ b/tests/sqlparser_common.rs
@@ -100,8 +100,11 @@ fn parse_insert_values() {
         Expr::value(number("2")),
         Expr::value(number("3")),
     ];
-    let rows1 = vec![row.clone()];
-    let rows2 = vec![row.clone(), row];
+    let rows1 = vec![Parens::with_empty_span(row.clone())];
+    let rows2 = vec![
+        Parens::with_empty_span(row.clone()),
+        Parens::with_empty_span(row),
+    ];
 
     let sql = "INSERT customer VALUES (1, 2, 3)";
     check_one(sql, "customer", &[], &rows1, false);
@@ -140,7 +143,7 @@ fn parse_insert_values() {
         sql: &str,
         expected_table_name: &str,
         expected_columns: &[String],
-        expected_rows: &[Vec<Expr>],
+        expected_rows: &[Parens<Vec<Expr>>],
         expected_value_keyword: bool,
     ) {
         match verified_stmt(sql) {
@@ -10101,7 +10104,7 @@ fn parse_merge() {
                             kind: MergeInsertKind::Values(Values {
                                 value_keyword: false,
                                 explicit_row: false,
-                                rows: vec![vec![
+                                rows: vec![Parens::with_empty_span(vec![
                                     Expr::CompoundIdentifier(vec![
                                         Ident::new("stg"),
                                         Ident::new("A")
@@ -10114,7 +10117,7 @@ fn parse_merge() {
                                         Ident::new("stg"),
                                         Ident::new("C")
                                     ]),
-                                ]]
+                                ])]
                             }),
                             insert_predicate: None,
                         }),
diff --git a/tests/sqlparser_databricks.rs b/tests/sqlparser_databricks.rs
index 405dffaf..0ed0b411 100644
--- a/tests/sqlparser_databricks.rs
+++ b/tests/sqlparser_databricks.rs
@@ -174,14 +174,14 @@ fn test_values_clause() {
         value_keyword: false,
         explicit_row: false,
         rows: vec![
-            vec![
+            Parens::with_empty_span(vec![
                 Expr::Value((Value::DoubleQuotedString("one".to_owned())).with_empty_span()),
                 Expr::value(number("1")),
-            ],
-            vec![
+            ]),
+            Parens::with_empty_span(vec![
                 Expr::Value((Value::SingleQuotedString("two".to_owned())).with_empty_span()),
                 Expr::value(number("2")),
-            ],
+            ]),
         ],
     };
 
diff --git a/tests/sqlparser_mysql.rs b/tests/sqlparser_mysql.rs
index f0de7d81..04973dc2 100644
--- a/tests/sqlparser_mysql.rs
+++ b/tests/sqlparser_mysql.rs
@@ -1940,27 +1940,27 @@ fn parse_simple_insert() {
                         value_keyword: false,
                         explicit_row: false,
                         rows: vec![
-                            vec![
+                            Parens::with_empty_span(vec![
                                 Expr::Value(
                                     (Value::SingleQuotedString("Test Some Inserts".to_string()))
                                         .with_empty_span()
                                 ),
                                 Expr::value(number("1"))
-                            ],
-                            vec![
+                            ]),
+                            Parens::with_empty_span(vec![
                                 Expr::Value(
                                     (Value::SingleQuotedString("Test Entry 2".to_string()))
                                         .with_empty_span()
                                 ),
                                 Expr::value(number("2"))
-                            ],
-                            vec![
+                            ]),
+                            Parens::with_empty_span(vec![
                                 Expr::Value(
                                     (Value::SingleQuotedString("Test Entry 3".to_string()))
                                         .with_empty_span()
                                 ),
                                 Expr::value(number("3"))
-                            ]
+                            ])
                         ]
                     })),
                     order_by: None,
@@ -2011,13 +2011,13 @@ fn parse_ignore_insert() {
                     body: Box::new(SetExpr::Values(Values {
                         value_keyword: false,
                         explicit_row: false,
-                        rows: vec![vec![
+                        rows: vec![Parens::with_empty_span(vec![
                             Expr::Value(
                                 (Value::SingleQuotedString("Test Some Inserts".to_string()))
                                     .with_empty_span()
                             ),
                             Expr::value(number("1"))
-                        ]]
+                        ])]
                     })),
                     order_by: None,
                     limit_clause: None,
@@ -2067,13 +2067,13 @@ fn parse_priority_insert() {
                     body: Box::new(SetExpr::Values(Values {
                         value_keyword: false,
                         explicit_row: false,
-                        rows: vec![vec![
+                        rows: vec![Parens::with_empty_span(vec![
                             Expr::Value(
                                 (Value::SingleQuotedString("Test Some Inserts".to_string()))
                                     .with_empty_span()
                             ),
                             Expr::value(number("1"))
-                        ]]
+                        ])]
                     })),
                     order_by: None,
                     limit_clause: None,
@@ -2120,13 +2120,13 @@ fn parse_priority_insert() {
                     body: Box::new(SetExpr::Values(Values {
                         value_keyword: false,
                         explicit_row: false,
-                        rows: vec![vec![
+                        rows: vec![Parens::with_empty_span(vec![
                             Expr::Value(
                                 (Value::SingleQuotedString("Test Some Inserts".to_string()))
                                     .with_empty_span()
                             ),
                             Expr::value(number("1"))
-                        ]]
+                        ])]
                     })),
                     order_by: None,
                     limit_clause: None,
@@ -2176,9 +2176,9 @@ fn parse_insert_as() {
                     body: Box::new(SetExpr::Values(Values {
                         value_keyword: false,
                         explicit_row: false,
-                        rows: vec![vec![Expr::Value(
+                        rows: vec![Parens::with_empty_span(vec![Expr::Value(
                             (Value::SingleQuotedString("2024-01-01".to_string())).with_empty_span()
-                        )]]
+                        )])]
                     })),
                     order_by: None,
                     limit_clause: None,
@@ -2239,13 +2239,13 @@ fn parse_insert_as() {
                     body: Box::new(SetExpr::Values(Values {
                         value_keyword: false,
                         explicit_row: false,
-                        rows: vec![vec![
+                        rows: vec![Parens::with_empty_span(vec![
                             Expr::value(number("1")),
                             Expr::Value(
                                 (Value::SingleQuotedString("2024-01-01".to_string()))
                                     .with_empty_span()
                             )
-                        ]]
+                        ])]
                     })),
                     order_by: None,
                     limit_clause: None,
@@ -2296,13 +2296,13 @@ fn parse_replace_insert() {
                     body: Box::new(SetExpr::Values(Values {
                         value_keyword: false,
                         explicit_row: false,
-                        rows: vec![vec![
+                        rows: vec![Parens::with_empty_span(vec![
                             Expr::Value(
                                 (Value::SingleQuotedString("Test Some Inserts".to_string()))
                                     .with_empty_span()
                             ),
                             Expr::value(number("1"))
-                        ]]
+                        ])]
                     })),
                     order_by: None,
                     limit_clause: None,
@@ -2344,7 +2344,10 @@ fn parse_empty_row_insert() {
                     body: Box::new(SetExpr::Values(Values {
                         value_keyword: false,
                         explicit_row: false,
-                        rows: vec![vec![], vec![]]
+                        rows: vec![
+                            Parens::with_empty_span(vec![]),
+                            Parens::with_empty_span(vec![])
+                        ]
                     })),
                     order_by: None,
                     limit_clause: None,
@@ -2395,7 +2398,7 @@ fn parse_insert_with_on_duplicate_update() {
                     body: Box::new(SetExpr::Values(Values {
                         value_keyword: false,
                         explicit_row: false,
-                        rows: vec![vec![
+                        rows: vec![Parens::with_empty_span(vec![
                             Expr::Value(
                                 (Value::SingleQuotedString("accounting_manager".to_string()))
                                     .with_empty_span()
@@ -2410,7 +2413,7 @@ fn parse_insert_with_on_duplicate_update() {
                             Expr::Value((Value::Boolean(true)).with_empty_span()),
                             Expr::Value((Value::Boolean(true)).with_empty_span()),
                             Expr::Value((Value::Boolean(true)).with_empty_span()),
-                        ]]
+                        ])]
                     })),
                     order_by: None,
                     limit_clause: None,
diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs
index 22e265bb..86315b1e 100644
--- a/tests/sqlparser_postgres.rs
+++ b/tests/sqlparser_postgres.rs
@@ -2070,11 +2070,11 @@ fn parse_prepare() {
             assert_eq!(table_name.to_string(), "customers");
             assert!(columns.is_empty());
 
-            let expected_values = [vec![
+            let expected_values = [Parens::with_empty_span(vec![
                 Expr::Identifier("a1".into()),
                 Expr::Identifier("a2".into()),
                 Expr::Identifier("a3".into()),
-            ]];
+            ])];
             match &*source.body {
                 SetExpr::Values(Values { rows, .. }) => {
                     assert_eq!(rows.as_slice(), &expected_values)
@@ -5774,10 +5774,10 @@ fn test_simple_postgres_insert_with_alias() {
                 body: Box::new(SetExpr::Values(Values {
                     value_keyword: false,
                     explicit_row: false,
-                    rows: vec![vec![
+                    rows: vec![Parens::with_empty_span(vec![
                         Expr::Identifier(Ident::new("DEFAULT")),
                         Expr::Value((Value::Number("123".to_string(), false)).with_empty_span())
-                    ]]
+                    ])]
                 })),
                 order_by: None,
                 limit_clause: None,
@@ -5854,13 +5854,13 @@ fn test_simple_postgres_insert_with_alias() {
                 body: Box::new(SetExpr::Values(Values {
                     value_keyword: false,
                     explicit_row: false,
-                    rows: vec![vec![
+                    rows: vec![Parens::with_empty_span(vec![
                         Expr::Identifier(Ident::new("DEFAULT")),
                         Expr::Value(
                             (Value::Number(bigdecimal::BigDecimal::new(123.into(), 0), false))
                                 .with_empty_span()
                         )
-                    ]]
+                    ])]
                 })),
                 order_by: None,
                 limit_clause: None,
@@ -5936,12 +5936,12 @@ fn test_simple_insert_with_quoted_alias() {
                 body: Box::new(SetExpr::Values(Values {
                     value_keyword: false,
                     explicit_row: false,
-                    rows: vec![vec![
+                    rows: vec![Parens::with_empty_span(vec![
                         Expr::Identifier(Ident::new("DEFAULT")),
                         Expr::Value(
                             (Value::SingleQuotedString("0123".to_string())).with_empty_span()
                         )
-                    ]]
+                    ])]
                 })),
                 order_by: None,
                 limit_clause: None,


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datafusion.apache.org
For additional commands, e-mail: commits-help@datafusion.apache.org