From 3f18c0a2fddda792e63bf6900be8de1f0a534666 Mon Sep 17 00:00:00 2001
From: Lukasz Stefaniak <lustefaniak@gmail.com>
Date: Mon, 2 Oct 2023 22:02:47 +0200
Subject: [PATCH 1/2] clickhouse: SELECT * EXCEPT/REPLACE

---
 src/ast/query.rs              |  2 ++
 src/parser/mod.rs             |  6 ++++--
 tests/sqlparser_clickhouse.rs | 10 ++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/ast/query.rs b/src/ast/query.rs
index 88b0931de..1aed3d916 100644
--- a/src/ast/query.rs
+++ b/src/ast/query.rs
@@ -431,11 +431,13 @@ pub struct WildcardAdditionalOptions {
     /// `[EXCLUDE...]`.
     pub opt_exclude: Option<ExcludeSelectItem>,
     /// `[EXCEPT...]`.
+    ///  Clickhouse syntax: <https://clickhouse.com/docs/en/sql-reference/statements/select#except>
     pub opt_except: Option<ExceptSelectItem>,
     /// `[RENAME ...]`.
     pub opt_rename: Option<RenameSelectItem>,
     /// `[REPLACE]`
     ///  BigQuery syntax: <https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax#select_replace>
+    ///  Clickhouse syntax: <https://clickhouse.com/docs/en/sql-reference/statements/select#replace>
     pub opt_replace: Option<ReplaceSelectItem>,
 }
 
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index 95f1f8edc..4f5c58802 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -6935,7 +6935,8 @@ impl<'a> Parser<'a> {
         } else {
             None
         };
-        let opt_except = if dialect_of!(self is GenericDialect | BigQueryDialect) {
+        let opt_except = if dialect_of!(self is GenericDialect | BigQueryDialect | ClickHouseDialect)
+        {
             self.parse_optional_select_item_except()?
         } else {
             None
@@ -6946,7 +6947,8 @@ impl<'a> Parser<'a> {
             None
         };
 
-        let opt_replace = if dialect_of!(self is GenericDialect | BigQueryDialect) {
+        let opt_replace = if dialect_of!(self is GenericDialect | BigQueryDialect | ClickHouseDialect)
+        {
             self.parse_optional_select_item_replace()?
         } else {
             None
diff --git a/tests/sqlparser_clickhouse.rs b/tests/sqlparser_clickhouse.rs
index 9efe4a368..143ec185f 100644
--- a/tests/sqlparser_clickhouse.rs
+++ b/tests/sqlparser_clickhouse.rs
@@ -355,6 +355,16 @@ fn parse_limit_by() {
     );
 }
 
+#[test]
+fn parse_select_star_except() {
+    clickhouse().verified_stmt("SELECT * EXCEPT (prev_status) FROM anomalies");
+}
+
+#[test]
+fn parse_select_star_replace() {
+    clickhouse().verified_stmt("SELECT * REPLACE (i + 1 AS i) FROM columns_transformers");
+}
+
 fn clickhouse() -> TestedDialects {
     TestedDialects {
         dialects: vec![Box::new(ClickHouseDialect {})],

From bbb2252588a00699fc4952576622686272f702a8 Mon Sep 17 00:00:00 2001
From: Lukasz Stefaniak <lustefaniak@gmail.com>
Date: Wed, 4 Oct 2023 12:34:04 +0200
Subject: [PATCH 2/2] clickhouse: * EXCEPT column_name

---
 src/parser/mod.rs             | 31 ++++++++++++++++++++-----------
 tests/sqlparser_clickhouse.rs |  8 ++++++++
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index 4f5c58802..687120322 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -6991,18 +6991,27 @@ impl<'a> Parser<'a> {
         &mut self,
     ) -> Result<Option<ExceptSelectItem>, ParserError> {
         let opt_except = if self.parse_keyword(Keyword::EXCEPT) {
-            let idents = self.parse_parenthesized_column_list(Mandatory, false)?;
-            match &idents[..] {
-                [] => {
-                    return self.expected(
-                        "at least one column should be parsed by the expect clause",
-                        self.peek_token(),
-                    )?;
+            if self.peek_token().token == Token::LParen {
+                let idents = self.parse_parenthesized_column_list(Mandatory, false)?;
+                match &idents[..] {
+                    [] => {
+                        return self.expected(
+                            "at least one column should be parsed by the expect clause",
+                            self.peek_token(),
+                        )?;
+                    }
+                    [first, idents @ ..] => Some(ExceptSelectItem {
+                        first_element: first.clone(),
+                        additional_elements: idents.to_vec(),
+                    }),
                 }
-                [first, idents @ ..] => Some(ExceptSelectItem {
-                    first_element: first.clone(),
-                    additional_elements: idents.to_vec(),
-                }),
+            } else {
+                // Clickhouse allows EXCEPT column_name
+                let ident = self.parse_identifier()?;
+                Some(ExceptSelectItem {
+                    first_element: ident,
+                    additional_elements: vec![],
+                })
             }
         } else {
             None
diff --git a/tests/sqlparser_clickhouse.rs b/tests/sqlparser_clickhouse.rs
index 143ec185f..8cca0da0b 100644
--- a/tests/sqlparser_clickhouse.rs
+++ b/tests/sqlparser_clickhouse.rs
@@ -360,6 +360,14 @@ fn parse_select_star_except() {
     clickhouse().verified_stmt("SELECT * EXCEPT (prev_status) FROM anomalies");
 }
 
+#[test]
+fn parse_select_star_except_no_parens() {
+    clickhouse().one_statement_parses_to(
+        "SELECT * EXCEPT prev_status FROM anomalies",
+        "SELECT * EXCEPT (prev_status) FROM anomalies",
+    );
+}
+
 #[test]
 fn parse_select_star_replace() {
     clickhouse().verified_stmt("SELECT * REPLACE (i + 1 AS i) FROM columns_transformers");