Code review comments

Author: yoavcloud

src/ast/mod.rs

@@ -10108,12 +10108,12 @@ impl fmt::Display for CreateUser {
 
 /// Modifies the properties of a user
 ///
-/// [Snowflake Syntax]:
+/// [Snowflake Syntax:](https://docs.snowflake.com/en/sql-reference/sql/alter-user)
 /// ```sql
 /// ALTER USER [ IF EXISTS ] [ <name> ] [ OPTIONS ]
 /// ```
 ///
-/// [PostgreSQL Syntax]:(https://www.postgresql.org/docs/current/sql-alteruser.html)
+/// [PostgreSQL Syntax:](https://www.postgresql.org/docs/current/sql-alteruser.html)
 /// ```sql
 /// ALTER USER <role_specification> [ WITH ] option [ ... ]
 /// ```
@@ -10338,10 +10338,10 @@ pub struct AlterUserPassword {
 
 impl Display for AlterUserPassword {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "PASSWORD")?;
         if self.encrypted {
-            write!(f, " ENCRYPTED")?;
+            write!(f, "ENCRYPTED ")?;
         }
+        write!(f, "PASSWORD")?;
         match &self.password {
             None => write!(f, " NULL")?,
             Some(password) => write!(f, " '{}'", value::escape_single_quote_string(password))?,

src/parser/alter.rs

@@ -295,18 +295,15 @@ impl Parser<'_> {
 
         let encrypted = self.parse_keyword(Keyword::ENCRYPTED);
         let password = if self.parse_keyword(Keyword::PASSWORD) {
-            if self.parse_keyword(Keyword::NULL) {
-                Some(AlterUserPassword {
-                    encrypted,
-                    password: None,
-                })
+            let password = if self.parse_keyword(Keyword::NULL) {
+                None
             } else {
-                let password = self.parse_literal_string()?;
-                Some(AlterUserPassword {
-                    encrypted,
-                    password: Some(password),
-                })
-            }
+                Some(self.parse_literal_string()?)
+            };
+            Some(AlterUserPassword {
+                encrypted,
+                password,
+            })
         } else {
             None
         };

tests/sqlparser_common.rs

@@ -17952,6 +17952,9 @@ fn test_parse_alter_user() {
     verified_stmt("ALTER USER u1 SET DEFAULT_SECONDARY_ROLES=('ALL'), PASSWORD='secret', WORKLOAD_IDENTITY=(TYPE=AWS, ARN='arn:aws:iam::123456789:r1/')");
 
     verified_stmt("ALTER USER u1 PASSWORD 'AAA'");
+    verified_stmt("ALTER USER u1 ENCRYPTED PASSWORD 'AAA'");
+    verified_stmt("ALTER USER u1 PASSWORD NULL");
+
     one_statement_parses_to(
         "ALTER USER u1 WITH PASSWORD 'AAA'",
         "ALTER USER u1 PASSWORD 'AAA'",