From e4ceed7496e4677233bc3cf0a2304640dcd3bc7d Mon Sep 17 00:00:00 2001
From: alexander-beedie <alexander.m.beedie@icloud.com>
Date: Sun, 23 Jun 2024 23:16:20 +0400
Subject: [PATCH] Fix Snowflake wildcard `REPLACE ... RENAME` order

---
 src/ast/query.rs             | 13 ++++++------
 src/parser/mod.rs            | 11 +++++-----
 tests/sqlparser_snowflake.rs | 39 ++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/src/ast/query.rs b/src/ast/query.rs
index fcd5b970d..0fde3e6b7 100644
--- a/src/ast/query.rs
+++ b/src/ast/query.rs
@@ -547,19 +547,20 @@ impl fmt::Display for IdentWithAlias {
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub struct WildcardAdditionalOptions {
     /// `[ILIKE...]`.
-    /// Snowflake syntax: <https://docs.snowflake.com/en/sql-reference/sql/select>
+    ///  Snowflake syntax: <https://docs.snowflake.com/en/sql-reference/sql/select#parameters>
     pub opt_ilike: Option<IlikeSelectItem>,
     /// `[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>
+    ///  Snowflake syntax: <https://docs.snowflake.com/en/sql-reference/sql/select#parameters>
     pub opt_replace: Option<ReplaceSelectItem>,
+    /// `[RENAME ...]`.
+    pub opt_rename: Option<RenameSelectItem>,
 }
 
 impl fmt::Display for WildcardAdditionalOptions {
@@ -573,12 +574,12 @@ impl fmt::Display for WildcardAdditionalOptions {
         if let Some(except) = &self.opt_except {
             write!(f, " {except}")?;
         }
-        if let Some(rename) = &self.opt_rename {
-            write!(f, " {rename}")?;
-        }
         if let Some(replace) = &self.opt_replace {
             write!(f, " {replace}")?;
         }
+        if let Some(rename) = &self.opt_rename {
+            write!(f, " {rename}")?;
+        }
         Ok(())
     }
 }
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index 537609973..33095c428 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -10175,15 +10175,14 @@ impl<'a> Parser<'a> {
         } else {
             None
         };
-        let opt_rename = if dialect_of!(self is GenericDialect | SnowflakeDialect) {
-            self.parse_optional_select_item_rename()?
+        let opt_replace = if dialect_of!(self is GenericDialect | BigQueryDialect | ClickHouseDialect | DuckDbDialect | SnowflakeDialect)
+        {
+            self.parse_optional_select_item_replace()?
         } else {
             None
         };
-
-        let opt_replace = if dialect_of!(self is GenericDialect | BigQueryDialect | ClickHouseDialect |  DuckDbDialect | SnowflakeDialect)
-        {
-            self.parse_optional_select_item_replace()?
+        let opt_rename = if dialect_of!(self is GenericDialect | SnowflakeDialect) {
+            self.parse_optional_select_item_rename()?
         } else {
             None
         };
diff --git a/tests/sqlparser_snowflake.rs b/tests/sqlparser_snowflake.rs
index 5e8fef0c5..2f4ed1316 100644
--- a/tests/sqlparser_snowflake.rs
+++ b/tests/sqlparser_snowflake.rs
@@ -1016,6 +1016,44 @@ fn test_select_wildcard_with_rename() {
     assert_eq!(expected, select.projection[0]);
 }
 
+#[test]
+fn test_select_wildcard_with_replace_and_rename() {
+    let select = snowflake_and_generic().verified_only_select(
+        "SELECT * REPLACE (col_z || col_z AS col_z) RENAME (col_z AS col_zz) FROM data",
+    );
+    let expected = SelectItem::Wildcard(WildcardAdditionalOptions {
+        opt_replace: Some(ReplaceSelectItem {
+            items: vec![Box::new(ReplaceSelectElement {
+                expr: Expr::BinaryOp {
+                    left: Box::new(Expr::Identifier(Ident::new("col_z"))),
+                    op: BinaryOperator::StringConcat,
+                    right: Box::new(Expr::Identifier(Ident::new("col_z"))),
+                },
+                column_name: Ident::new("col_z"),
+                as_keyword: true,
+            })],
+        }),
+        opt_rename: Some(RenameSelectItem::Multiple(vec![IdentWithAlias {
+            ident: Ident::new("col_z"),
+            alias: Ident::new("col_zz"),
+        }])),
+        ..Default::default()
+    });
+    assert_eq!(expected, select.projection[0]);
+
+    // rename cannot precede replace
+    // https://docs.snowflake.com/en/sql-reference/sql/select#parameters
+    assert_eq!(
+        snowflake_and_generic()
+            .parse_sql_statements(
+                "SELECT * RENAME (col_z AS col_zz) REPLACE (col_z || col_z AS col_z) FROM data"
+            )
+            .unwrap_err()
+            .to_string(),
+        "sql parser error: Expected: end of statement, found: REPLACE"
+    );
+}
+
 #[test]
 fn test_select_wildcard_with_exclude_and_rename() {
     let select = snowflake_and_generic()
@@ -1031,6 +1069,7 @@ fn test_select_wildcard_with_exclude_and_rename() {
     assert_eq!(expected, select.projection[0]);
 
     // rename cannot precede exclude
+    // https://docs.snowflake.com/en/sql-reference/sql/select#parameters
     assert_eq!(
         snowflake_and_generic()
             .parse_sql_statements("SELECT * RENAME col_a AS col_b EXCLUDE col_z FROM data")