Code review comments and missing option

Author: yoavcloud

src/ast/mod.rs

@@ -10578,6 +10578,7 @@ impl fmt::Display for CreateUser {
 pub struct AlterUser {
     pub if_exists: bool,
     pub name: Ident,
+    /// The following fields are Snowflake-specific: <https://docs.snowflake.com/en/sql-reference/sql/alter-user#syntax>
     pub rename_to: Option<Ident>,
     pub reset_password: bool,
     pub abort_all_queries: bool,
@@ -10587,6 +10588,7 @@ pub struct AlterUser {
     pub set_default_mfa_method: Option<MfaMethodKind>,
     pub remove_mfa_method: Option<MfaMethodKind>,
     pub modify_mfa_method: Option<AlterUserModifyMfaMethod>,
+    pub add_mfa_method_otp: Option<AlterUserAddMfaMethodOtp>,
     pub set_policy: Option<AlterUserSetPolicy>,
     pub unset_policy: Option<UserPolicyKind>,
     pub set_tag: KeyValueOptions,
@@ -10617,6 +10619,16 @@ pub struct AlterUserRemoveRoleDelegation {
     pub integration: Ident,
 }
 
+/// ```sql
+/// ADD MFA METHOD OTP [ COUNT = number ]
+/// ```
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
+pub struct AlterUserAddMfaMethodOtp {
+    pub count: Option<Value>,
+}
+
 /// ```sql
 /// ALTER USER [ IF EXISTS ] [ <name> ] MODIFY MFA METHOD <mfa_method> SET COMMENT = '<string>'
 /// ```
@@ -10731,6 +10743,12 @@ impl fmt::Display for AlterUser {
                 value::escape_single_quote_string(comment)
             )?;
         }
+        if let Some(add_mfa_method_otp) = &self.add_mfa_method_otp {
+            write!(f, " ADD MFA METHOD OTP")?;
+            if let Some(count) = &add_mfa_method_otp.count {
+                write!(f, " COUNT = {count}")?;
+            }
+        }
         if let Some(policy) = &self.set_policy {
             let policy_kind = &policy.policy_kind;
             let name = &policy.policy;

src/keywords.rs

@@ -692,6 +692,7 @@ define_keywords!(
     ORDINALITY,
     ORGANIZATION,
     OTHER,
+    OTP,
     OUT,
     OUTER,
     OUTPUT,

src/parser/alter.rs

@@ -20,9 +20,9 @@ use crate::{
     ast::{
         helpers::key_value_options::{KeyValueOptions, KeyValueOptionsDelimiter},
         AlterConnectorOwner, AlterPolicyOperation, AlterRoleOperation, AlterUser,
-        AlterUserAddRoleDelegation, AlterUserModifyMfaMethod, AlterUserRemoveRoleDelegation,
-        AlterUserSetPolicy, Expr, MfaMethodKind, Password, ResetConfig, RoleOption, SetConfigValue,
-        Statement, UserPolicyKind,
+        AlterUserAddMfaMethodOtp, AlterUserAddRoleDelegation, AlterUserModifyMfaMethod,
+        AlterUserRemoveRoleDelegation, AlterUserSetPolicy, Expr, MfaMethodKind, Password,
+        ResetConfig, RoleOption, SetConfigValue, Statement, UserPolicyKind,
     },
     dialect::{MsSqlDialect, PostgreSqlDialect},
     keywords::Keyword,
@@ -213,6 +213,18 @@ impl Parser<'_> {
             } else {
                 None
             };
+        let add_mfa_method_otp =
+            if self.parse_keywords(&[Keyword::ADD, Keyword::MFA, Keyword::METHOD, Keyword::OTP]) {
+                let count = if self.parse_keyword(Keyword::COUNT) {
+                    self.expect_token(&Token::Eq)?;
+                    Some(self.parse_value()?.into())
+                } else {
+                    None
+                };
+                Some(AlterUserAddMfaMethodOtp { count })
+            } else {
+                None
+            };
         let set_policy =
             if self.parse_keywords(&[Keyword::SET, Keyword::AUTHENTICATION, Keyword::POLICY]) {
                 Some(AlterUserSetPolicy {
@@ -292,6 +304,7 @@ impl Parser<'_> {
             set_default_mfa_method,
             remove_mfa_method,
             modify_mfa_method,
+            add_mfa_method_otp,
             set_policy,
             unset_policy,
             set_tag,

tests/sqlparser_common.rs

@@ -17306,6 +17306,9 @@ fn test_parse_alter_user() {
         }
         _ => unreachable!(),
     }
+    verified_stmt("ALTER USER u1 ADD MFA METHOD OTP");
+    verified_stmt("ALTER USER u1 ADD MFA METHOD OTP COUNT = 8");
+
     let stmt = verified_stmt("ALTER USER u1 SET AUTHENTICATION POLICY p1");
     match stmt {
         Statement::AlterUser(alter) => {