Merge branch 'main' into postgres-regression-1

LucaCappelletti94 · web-flow · commit cd8998f8fadd · 2026-03-02T21:28:56.000+01:00
diff --git a/README.md b/README.md
@@ -159,9 +159,9 @@ $ cargo run --features json_example --example cli FILENAME.sql [--dialectname]
 
 ## Users
 
-This parser is currently being used by the [DataFusion] query engine, [LocustDB],
-[Ballista], [GlueSQL], [Opteryx], [Polars], [PRQL], [Qrlew], [JumpWire], [ParadeDB], [CipherStash Proxy],
-and [GreptimeDB].
+This parser is currently being used by the [DataFusion] query engine,
+[LocustDB], [Ballista], [GlueSQL], [Opteryx], [Polars], [PRQL], [Qrlew],
+[JumpWire], [ParadeDB], [CipherStash Proxy], [Readyset] and [GreptimeDB].
 
 If your project is using sqlparser-rs feel free to make a PR to add it
 to this list.
@@ -282,3 +282,4 @@ licensed as above, without any additional terms or conditions.
 [`GenericDialect`]: https://docs.rs/sqlparser/latest/sqlparser/dialect/struct.GenericDialect.html
 [CipherStash Proxy]: https://github.com/cipherstash/proxy
 [GreptimeDB]: https://github.com/GreptimeTeam/greptimedb
+[Readyset]: https://github.com/readysettech/readyset
diff --git a/src/ast/ddl.rs b/src/ast/ddl.rs
@@ -2040,7 +2040,7 @@ impl fmt::Display for ColumnOption {
                 Ok(())
             }
             Unique(constraint) => {
-                write!(f, "UNIQUE")?;
+                write!(f, "UNIQUE{:>}", constraint.index_type_display)?;
                 if let Some(characteristics) = &constraint.characteristics {
                     write!(f, " {characteristics}")?;
                 }
diff --git a/src/ast/dml.rs b/src/ast/dml.rs
@@ -79,6 +79,9 @@ pub struct Insert {
     pub on: Option<OnInsert>,
     /// RETURNING
     pub returning: Option<Vec<SelectItem>>,
+    /// OUTPUT (MSSQL)
+    /// See <https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql>
+    pub output: Option<OutputClause>,
     /// Only for mysql
     pub replace_into: bool,
     /// Only for mysql
@@ -203,6 +206,11 @@ impl Display for Insert {
             SpaceOrNewline.fmt(f)?;
         }
 
+        if let Some(output) = &self.output {
+            write!(f, "{output}")?;
+            SpaceOrNewline.fmt(f)?;
+        }
+
         if let Some(settings) = &self.settings {
             write!(f, "SETTINGS {}", display_comma_separated(settings))?;
             SpaceOrNewline.fmt(f)?;
@@ -289,6 +297,9 @@ pub struct Delete {
     pub selection: Option<Expr>,
     /// RETURNING
     pub returning: Option<Vec<SelectItem>>,
+    /// OUTPUT (MSSQL)
+    /// See <https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql>
+    pub output: Option<OutputClause>,
     /// ORDER BY (MySQL)
     pub order_by: Vec<OrderByExpr>,
     /// LIMIT (MySQL)
@@ -314,6 +325,10 @@ impl Display for Delete {
                 indented_list(f, from)?;
             }
         }
+        if let Some(output) = &self.output {
+            SpaceOrNewline.fmt(f)?;
+            write!(f, "{output}")?;
+        }
         if let Some(using) = &self.using {
             SpaceOrNewline.fmt(f)?;
             f.write_str("USING")?;
@@ -367,6 +382,9 @@ pub struct Update {
     pub selection: Option<Expr>,
     /// RETURNING
     pub returning: Option<Vec<SelectItem>>,
+    /// OUTPUT (MSSQL)
+    /// See <https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql>
+    pub output: Option<OutputClause>,
     /// SQLite-specific conflict resolution clause
     pub or: Option<SqliteOnConflict>,
     /// LIMIT
@@ -396,6 +414,10 @@ impl Display for Update {
             f.write_str("SET")?;
             indented_list(f, &self.assignments)?;
         }
+        if let Some(output) = &self.output {
+            SpaceOrNewline.fmt(f)?;
+            write!(f, "{output}")?;
+        }
         if let Some(UpdateTableFromKind::AfterSet(from)) = &self.from {
             SpaceOrNewline.fmt(f)?;
             f.write_str("FROM")?;
@@ -717,11 +739,11 @@ impl Display for MergeUpdateExpr {
     }
 }
 
-/// A `OUTPUT` Clause in the end of a `MERGE` Statement
+/// An `OUTPUT` clause on `MERGE`, `INSERT`, `UPDATE`, or `DELETE` (MSSQL).
 ///
 /// Example:
 /// OUTPUT $action, deleted.* INTO dbo.temp_products;
-/// [mssql](https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql)
+/// <https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql>
 #[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
diff --git a/src/ast/mod.rs b/src/ast/mod.rs
@@ -1131,7 +1131,7 @@ pub enum Expr {
     /// ```sql
     /// TRIM([BOTH | LEADING | TRAILING] [<expr> FROM] <expr>)
     /// TRIM(<expr>)
-    /// TRIM(<expr>, [, characters]) -- only Snowflake or Bigquery
+    /// TRIM(<expr>, [, characters]) -- PostgreSQL, DuckDB, Snowflake, BigQuery, Generic
     /// ```
     Trim {
         /// The expression to trim from.
diff --git a/src/ast/query.rs b/src/ast/query.rs
@@ -1018,13 +1018,13 @@ pub enum ExcludeSelectItem {
     /// ```plaintext
     /// <col_name>
     /// ```
-    Single(Ident),
+    Single(ObjectName),
     /// Multiple column names inside parenthesis.
     /// # Syntax
     /// ```plaintext
     /// (<col_name>, <col_name>, ...)
     /// ```
-    Multiple(Vec<Ident>),
+    Multiple(Vec<ObjectName>),
 }
 
 impl fmt::Display for ExcludeSelectItem {
diff --git a/src/ast/spans.rs b/src/ast/spans.rs
@@ -906,6 +906,7 @@ impl Spanned for Delete {
             using,
             selection,
             returning,
+            output,
             order_by,
             limit,
         } = self;
@@ -923,6 +924,7 @@ impl Spanned for Delete {
                     )
                     .chain(selection.iter().map(|i| i.span()))
                     .chain(returning.iter().flat_map(|i| i.iter().map(|k| k.span())))
+                    .chain(output.iter().map(|i| i.span()))
                     .chain(order_by.iter().map(|i| i.span()))
                     .chain(limit.iter().map(|i| i.span())),
             ),
@@ -940,6 +942,7 @@ impl Spanned for Update {
             from,
             selection,
             returning,
+            output,
             or: _,
             limit,
         } = self;
@@ -951,6 +954,7 @@ impl Spanned for Update {
                 .chain(from.iter().map(|i| i.span()))
                 .chain(selection.iter().map(|i| i.span()))
                 .chain(returning.iter().flat_map(|i| i.iter().map(|k| k.span())))
+                .chain(output.iter().map(|i| i.span()))
                 .chain(limit.iter().map(|i| i.span())),
         )
     }
@@ -1312,6 +1316,7 @@ impl Spanned for Insert {
             has_table_keyword: _, // bool
             on,
             returning,
+            output,
             replace_into: _, // bool
             priority: _,     // todo, mysql specific
             insert_alias: _, // todo, mysql specific
@@ -1334,7 +1339,8 @@ impl Spanned for Insert {
                 .chain(partitioned.iter().flat_map(|i| i.iter().map(|k| k.span())))
                 .chain(after_columns.iter().map(|i| i.span))
                 .chain(on.as_ref().map(|i| i.span()))
-                .chain(returning.iter().flat_map(|i| i.iter().map(|k| k.span()))),
+                .chain(returning.iter().flat_map(|i| i.iter().map(|k| k.span())))
+                .chain(output.iter().map(|i| i.span())),
         )
     }
 }
@@ -1849,8 +1855,8 @@ impl Spanned for IlikeSelectItem {
 impl Spanned for ExcludeSelectItem {
     fn span(&self) -> Span {
         match self {
-            ExcludeSelectItem::Single(ident) => ident.span,
-            ExcludeSelectItem::Multiple(vec) => union_spans(vec.iter().map(|i| i.span)),
+            ExcludeSelectItem::Single(name) => name.span(),
+            ExcludeSelectItem::Multiple(vec) => union_spans(vec.iter().map(|i| i.span())),
         }
     }
 }
diff --git a/src/dialect/bigquery.rs b/src/dialect/bigquery.rs
@@ -162,4 +162,8 @@ impl Dialect for BigQueryDialect {
     fn supports_select_wildcard_replace(&self) -> bool {
         true
     }
+
+    fn supports_comma_separated_trim(&self) -> bool {
+        true
+    }
 }
diff --git a/src/dialect/clickhouse.rs b/src/dialect/clickhouse.rs
@@ -141,4 +141,8 @@ impl Dialect for ClickHouseDialect {
     fn supports_select_wildcard_replace(&self) -> bool {
         true
     }
+
+    fn supports_comma_separated_trim(&self) -> bool {
+        true
+    }
 }
diff --git a/src/dialect/duckdb.rs b/src/dialect/duckdb.rs
@@ -129,4 +129,8 @@ impl Dialect for DuckDbDialect {
     fn supports_select_wildcard_replace(&self) -> bool {
         true
     }
+
+    fn supports_comma_separated_trim(&self) -> bool {
+        true
+    }
 }
diff --git a/src/dialect/generic.rs b/src/dialect/generic.rs
@@ -280,4 +280,12 @@ impl Dialect for GenericDialect {
     fn supports_constraint_keyword_without_name(&self) -> bool {
         true
     }
+
+    fn supports_key_column_option(&self) -> bool {
+        true
+    }
+
+    fn supports_comma_separated_trim(&self) -> bool {
+        true
+    }
 }
diff --git a/src/dialect/mod.rs b/src/dialect/mod.rs
@@ -1195,6 +1195,18 @@ pub trait Dialect: Debug + Any {
         false
     }
 
+    /// Returns true if the dialect supports the `KEY` keyword as part of
+    /// column-level constraints in a `CREATE TABLE` statement.
+    ///
+    /// When enabled, the parser accepts these MySQL-specific column options:
+    /// - `UNIQUE [KEY]` — optional `KEY` after `UNIQUE`
+    /// - `[PRIMARY] KEY` — standalone `KEY` as shorthand for `PRIMARY KEY`
+    ///
+    /// <https://dev.mysql.com/doc/refman/8.4/en/create-table.html>
+    fn supports_key_column_option(&self) -> bool {
+        false
+    }
+
     /// Returns true if the specified keyword is reserved and cannot be
     /// used as an identifier without special handling like quoting.
     fn is_reserved_for_identifier(&self, kw: Keyword) -> bool {
@@ -1639,6 +1651,12 @@ pub trait Dialect: Debug + Any {
     fn supports_select_format(&self) -> bool {
         false
     }
+
+    /// Returns true if the dialect supports the two-argument comma-separated
+    /// form of the `TRIM` function: `TRIM(expr, characters)`.
+    fn supports_comma_separated_trim(&self) -> bool {
+        false
+    }
 }
 
 /// Operators for which precedence must be defined.
diff --git a/src/dialect/mysql.rs b/src/dialect/mysql.rs
@@ -206,6 +206,11 @@ impl Dialect for MySqlDialect {
     fn supports_constraint_keyword_without_name(&self) -> bool {
         true
     }
+
+    /// See: <https://dev.mysql.com/doc/refman/8.4/en/create-table.html>
+    fn supports_key_column_option(&self) -> bool {
+        true
+    }
 }
 
 /// `LOCK TABLES`
diff --git a/src/dialect/postgresql.rs b/src/dialect/postgresql.rs
@@ -302,4 +302,12 @@ impl Dialect for PostgreSqlDialect {
     fn supports_insert_table_alias(&self) -> bool {
         true
     }
+
+    fn supports_create_table_like_parenthesized(&self) -> bool {
+        true
+    }
+
+    fn supports_comma_separated_trim(&self) -> bool {
+        true
+    }
 }
diff --git a/src/dialect/snowflake.rs b/src/dialect/snowflake.rs
@@ -667,6 +667,10 @@ impl Dialect for SnowflakeDialect {
     fn supports_lambda_functions(&self) -> bool {
         true
     }
+
+    fn supports_comma_separated_trim(&self) -> bool {
+        true
+    }
 }
 
 // Peeks ahead to identify tokens that are expected after
@@ -1780,6 +1784,7 @@ fn parse_multi_table_insert(
         has_table_keyword: false,
         on: None,
         returning: None,
+        output: None,
         replace_into: false,
         priority: None,
         insert_alias: None,
diff --git a/src/dialect/sqlite.rs b/src/dialect/sqlite.rs
@@ -120,4 +120,8 @@ impl Dialect for SQLiteDialect {
     fn supports_notnull_operator(&self) -> bool {
         true
     }
+
+    fn supports_comma_separated_trim(&self) -> bool {
+        true
+    }
 }
diff --git a/src/keywords.rs b/src/keywords.rs
@@ -1210,6 +1210,7 @@ pub const RESERVED_FOR_TABLE_ALIAS: &[Keyword] = &[
     Keyword::ANTI,
     Keyword::SEMI,
     Keyword::RETURNING,
+    Keyword::OUTPUT,
     Keyword::ASOF,
     Keyword::MATCH_CONDITION,
     // for MSSQL-specific OUTER APPLY (seems reserved in most dialects)
@@ -1264,6 +1265,7 @@ pub const RESERVED_FOR_COLUMN_ALIAS: &[Keyword] = &[
     Keyword::CLUSTER,
     Keyword::DISTRIBUTE,
     Keyword::RETURNING,
+    Keyword::VALUES,
     // Reserved only as a column alias in the `SELECT` clause
     Keyword::FROM,
     Keyword::INTO,
diff --git a/src/parser/merge.rs b/src/parser/merge.rs
@@ -218,7 +218,21 @@ impl Parser<'_> {
         self.parse_parenthesized_qualified_column_list(IsOptional::Optional, allow_empty)
     }
 
-    fn parse_output(
+    /// Parses an `OUTPUT` clause if present (MSSQL).
+    pub(super) fn maybe_parse_output_clause(
+        &mut self,
+    ) -> Result<Option<OutputClause>, ParserError> {
+        if self.parse_keyword(Keyword::OUTPUT) {
+            Ok(Some(self.parse_output(
+                Keyword::OUTPUT,
+                self.get_current_token().clone(),
+            )?))
+        } else {
+            Ok(None)
+        }
+    }
+
+    pub(super) fn parse_output(
         &mut self,
         start_keyword: Keyword,
         start_token: TokenWithSpan,
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs
diff --git a/tests/sqlparser_duckdb.rs b/tests/sqlparser_duckdb.rs
diff --git a/tests/sqlparser_mssql.rs b/tests/sqlparser_mssql.rs
diff --git a/tests/sqlparser_mysql.rs b/tests/sqlparser_mysql.rs
diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs
diff --git a/tests/sqlparser_snowflake.rs b/tests/sqlparser_snowflake.rs
diff --git a/tests/sqlparser_sqlite.rs b/tests/sqlparser_sqlite.rs

Original file line number	Diff line number	Diff line change
`@@ -2040,7 +2040,7 @@ impl fmt::Display for ColumnOption {`
`2040`	`2040`	`Ok(())`
`2041`	`2041`	`}`
`2042`	`2042`	`Unique(constraint) => {`
`2043`		`- write!(f, "UNIQUE")?;`
	`2043`	`+ write!(f, "UNIQUE{:>}", constraint.index_type_display)?;`
`2044`	`2044`	`if let Some(characteristics) = &constraint.characteristics {`
`2045`	`2045`	`write!(f, " {characteristics}")?;`
`2046`	`2046`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,4 +162,8 @@ impl Dialect for BigQueryDialect {`
`162`	`162`	`fn supports_select_wildcard_replace(&self) -> bool {`
`163`	`163`	`true`
`164`	`164`	`}`
	`165`	`+`
	`166`	`+ fn supports_comma_separated_trim(&self) -> bool {`
	`167`	`+ true`
	`168`	`+ }`
`165`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,4 +141,8 @@ impl Dialect for ClickHouseDialect {`
`141`	`141`	`fn supports_select_wildcard_replace(&self) -> bool {`
`142`	`142`	`true`
`143`	`143`	`}`
	`144`	`+`
	`145`	`+ fn supports_comma_separated_trim(&self) -> bool {`
	`146`	`+ true`
	`147`	`+ }`
`144`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,4 +129,8 @@ impl Dialect for DuckDbDialect {`
`129`	`129`	`fn supports_select_wildcard_replace(&self) -> bool {`
`130`	`130`	`true`
`131`	`131`	`}`
	`132`	`+`
	`133`	`+ fn supports_comma_separated_trim(&self) -> bool {`
	`134`	`+ true`
	`135`	`+ }`
`132`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -280,4 +280,12 @@ impl Dialect for GenericDialect {`
`280`	`280`	`fn supports_constraint_keyword_without_name(&self) -> bool {`
`281`	`281`	`true`
`282`	`282`	`}`
	`283`	`+`
	`284`	`+ fn supports_key_column_option(&self) -> bool {`
	`285`	`+ true`
	`286`	`+ }`
	`287`	`+`
	`288`	`+ fn supports_comma_separated_trim(&self) -> bool {`
	`289`	`+ true`
	`290`	`+ }`
`283`	`291`	`}`