@@ -1611,6 +1611,13 @@ pub enum AlterMaskingPolicyOperation {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub enum AlterRowAccessPolicyOperation {
+    /// `SET COMMENT = '<comment>'`.
+    SetComment {
+        /// The replacement comment.
+        comment: String,
+    },
+    /// `UNSET COMMENT`.
+    UnsetComment,
     /// `SET BODY -> <expr>`.
     SetBody {
         /// The replacement body expression.
@@ -1626,6 +1633,10 @@ pub enum AlterRowAccessPolicyOperation {
 impl fmt::Display for AlterRowAccessPolicyOperation {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
+            Self::SetComment { comment } => {
+                write!(f, "SET COMMENT = '{}'", escape_single_quote_string(comment))
+            }
+            Self::UnsetComment => write!(f, "UNSET COMMENT"),
             Self::SetBody { body } => write!(f, "SET BODY -> {body}"),
             Self::RenameTo { new_name } => write!(f, "RENAME TO {new_name}"),
         }
 
@@ -5776,6 +5776,8 @@ pub enum Statement {
         return_type: DataType,
         /// The policy body expression after `->`.
         policy_expr: Expr,
+        /// Optional policy comment.
+        comment: Option<String>,
     },
     /// ```sql
     /// ALTER ROW ACCESS POLICY [IF EXISTS] <name> RENAME TO <new_name>
@@ -9504,14 +9506,23 @@ impl fmt::Display for Statement {
                 args,
                 return_type,
                 policy_expr,
+                comment,
             } => {
                 write!(
                     f,
                     "CREATE {or_replace}ROW ACCESS POLICY {if_not_exists}{name} AS ({args}) RETURNS {return_type} -> {policy_expr}",
                     or_replace = if *or_replace { "OR REPLACE " } else if *or_alter { "OR ALTER " } else { "" },
                     if_not_exists = if *if_not_exists { "IF NOT EXISTS " } else { "" },
                     args = display_comma_separated(args),
-                )
+                )?;
+                if let Some(comment) = comment {
+                    write!(
+                        f,
+                        " COMMENT = '{}'",
+                        value::escape_single_quote_string(comment)
+                    )?;
+                }
+                Ok(())
             }
             Statement::AlterRowAccessPolicy {
                 if_exists,
 
@@ -5136,6 +5136,12 @@ fn parse_create_row_access_policy(
     let return_type = parser.parse_data_type()?;
     parser.expect_token(&Token::Arrow)?;
     let policy_expr = parser.parse_expr()?;
+    let comment = if parser.parse_keyword(Keyword::COMMENT) {
+        parser.expect_token(&Token::Eq)?;
+        Some(parse_row_access_policy_comment(parser)?)
+    } else {
+        None
+    };
     Ok(Statement::CreateRowAccessPolicy {
         or_replace,
         or_alter,
@@ -5144,6 +5150,7 @@ fn parse_create_row_access_policy(
         args,
         return_type,
         policy_expr,
+        comment,
     })
 }
 
@@ -5156,6 +5163,17 @@ fn parse_alter_row_access_policy(parser: &mut Parser) -> Result<Statement, Parse
         crate::ast::AlterRowAccessPolicyOperation::SetBody {
             body: parser.parse_expr()?,
         }
+    } else if parser.parse_keywords(&[Keyword::SET, Keyword::COMMENT]) {
+        parser.expect_token(&Token::Eq)?;
+        if parser.parse_keyword(Keyword::NULL) {
+            crate::ast::AlterRowAccessPolicyOperation::UnsetComment
+        } else {
+            crate::ast::AlterRowAccessPolicyOperation::SetComment {
+                comment: parse_row_access_policy_comment(parser)?,
+            }
+        }
+    } else if parser.parse_keywords(&[Keyword::UNSET, Keyword::COMMENT]) {
+        crate::ast::AlterRowAccessPolicyOperation::UnsetComment
     } else {
         parser.expect_keywords(&[Keyword::RENAME, Keyword::TO])?;
         crate::ast::AlterRowAccessPolicyOperation::RenameTo {
@@ -5169,6 +5187,17 @@ fn parse_alter_row_access_policy(parser: &mut Parser) -> Result<Statement, Parse
     })
 }
 
+fn parse_row_access_policy_comment(parser: &mut Parser) -> Result<String, ParserError> {
+    let unquoted = matches!(parser.peek_token_ref().token,
+        Token::Word(ref word) if word.quote_style.is_none());
+    let comment = parser.parse_literal_string()?;
+    Ok(if unquoted {
+        comment.to_uppercase()
+    } else {
+        comment
+    })
+}
+
 /// Parse `DROP ROW ACCESS POLICY [IF EXISTS] <name>`
 fn parse_drop_row_access_policy(parser: &mut Parser) -> Result<Statement, ParserError> {
     let if_exists = parser.parse_keywords(&[Keyword::IF, Keyword::EXISTS]);