update

Author: aleksei.p

src/dialect/snowflake.rs

@@ -245,14 +245,6 @@ impl Dialect for SnowflakeDialect {
                     .map(|p| Some(ColumnOption::Policy(ColumnPolicy::ProjectionPolicy(p)))))
             } else if parser.parse_keywords(&[Keyword::TAG]) {
                 Ok(parse_column_tags(parser, with).map(|p| Some(ColumnOption::Tags(p))))
-            } else if parser.parse_keywords(&[Keyword::COMMENT]) {
-                let next_token = parser.next_token();
-                match next_token.token {
-                    Token::DollarQuotedString(value, ..) => {
-                        Ok(Ok(Some(ColumnOption::Comment(value.value))))
-                    }
-                    _ => Err(ParserError::ParserError("not found match".to_string())),
-                }
             } else {
                 Err(ParserError::ParserError("not found match".to_string()))
             }
@@ -430,7 +422,7 @@ pub fn parse_create_table(
                 Keyword::COMMENT => {
                     // Rewind the COMMENT keyword
                     parser.prev_token();
-                    builder = builder.comment(parser.parse_optional_inline_comment(true)?);
+                    builder = builder.comment(parser.parse_optional_inline_comment()?);
                 }
                 Keyword::AS => {
                     let query = parser.parse_query()?;

src/parser/mod.rs

@@ -5765,7 +5765,7 @@ impl<'a> Parser<'a> {
             None
         };
 
-        let comment = self.parse_optional_inline_comment(false)?;
+        let comment = self.parse_optional_inline_comment()?;
 
         let with_dcproperties =
             match self.parse_options_with_keywords(&[Keyword::WITH, Keyword::DCPROPERTIES])? {
@@ -6822,8 +6822,7 @@ impl<'a> Parser<'a> {
         if !dialect_of!(self is HiveDialect) && self.parse_keyword(Keyword::COMMENT) {
             // rewind the COMMENT keyword
             self.prev_token();
-            let support_dollar_quoted_comment = dialect_of!(self is SnowflakeDialect);
-            comment = self.parse_optional_inline_comment(support_dollar_quoted_comment)?
+            comment = self.parse_optional_inline_comment()?
         };
 
         // Parse optional `AS ( query )`
@@ -6924,16 +6923,13 @@ impl<'a> Parser<'a> {
         })
     }
 
-    pub fn parse_optional_inline_comment(
-        &mut self,
-        support_dollar_quoted_comment: bool,
-    ) -> Result<Option<CommentDef>, ParserError> {
+    pub fn parse_optional_inline_comment(&mut self) -> Result<Option<CommentDef>, ParserError> {
         let comment = if self.parse_keyword(Keyword::COMMENT) {
             let has_eq = self.consume_token(&Token::Eq);
             let next_token = self.next_token();
             let comment = match next_token.token {
                 Token::SingleQuotedString(str) => str,
-                Token::DollarQuotedString(str) if support_dollar_quoted_comment => str.value,
+                Token::DollarQuotedString(str) => str.value,
                 _ => self.expected("comment", next_token)?,
             };
             Some(if has_eq {
@@ -7085,6 +7081,9 @@ impl<'a> Parser<'a> {
             let next_token = self.next_token();
             match next_token.token {
                 Token::SingleQuotedString(value, ..) => Ok(Some(ColumnOption::Comment(value))),
+                Token::DollarQuotedString(value, ..) => {
+                    Ok(Some(ColumnOption::Comment(value.value)))
+                }
                 _ => self.expected("string", next_token),
             }
         } else if self.parse_keyword(Keyword::NULL) {

tests/sqlparser_snowflake.rs

@@ -978,23 +978,17 @@ fn parse_sf_create_or_replace_with_comment_for_snowflake() {
 
 #[test]
 fn parse_sf_create_table_or_view_with_dollar_quoted_comment() {
-    assert!(snowflake()
-        .parse_sql_statements(
-            r#"CREATE OR REPLACE TEMPORARY VIEW foo.bar.baz (
-            "COL_1" COMMENT $$comment 1$$
-        ) COMMENT = $$view comment$$ AS (
-            SELECT 1
-        )"#
-        )
-        .is_ok());
+    // Snowflake transforms dollar quoted comments into a common comment in DDL representation of creation
+    snowflake()
+        .one_statement_parses_to(
+            r#"CREATE OR REPLACE TEMPORARY VIEW foo.bar.baz ("COL_1" COMMENT $$comment 1$$) COMMENT = $$view comment$$ AS (SELECT 1)"#,
+            r#"CREATE OR REPLACE TEMPORARY VIEW foo.bar.baz ("COL_1" COMMENT 'comment 1') COMMENT = 'view comment' AS (SELECT 1)"#
+        );
 
-    assert!(snowflake()
-        .parse_sql_statements(
-            r#"CREATE TABLE my_table (
-            a STRING COMMENT $$comment 1$$
-        ) COMMENT = $$table comment$$"#
-        )
-        .is_ok());
+    snowflake().one_statement_parses_to(
+        r#"CREATE TABLE my_table (a STRING COMMENT $$comment 1$$) COMMENT = $$table comment$$"#,
+        r#"CREATE TABLE my_table (a STRING COMMENT 'comment 1') COMMENT = 'table comment'"#,
+    );
 }
 
 #[test]