Address UNLOGGED review comments

Author: LucaCappelletti94

src/parser/mod.rs

@@ -5137,18 +5137,18 @@ impl<'a> Parser<'a> {
         let temporary = self
             .parse_one_of_keywords(&[Keyword::TEMP, Keyword::TEMPORARY])
             .is_some();
-        let unlogged = dialect_of!(self is PostgreSqlDialect | GenericDialect)
-            && self.parse_keyword(Keyword::UNLOGGED);
         let persistent = dialect_of!(self is DuckDbDialect)
             && self.parse_one_of_keywords(&[Keyword::PERSISTENT]).is_some();
         let create_view_params = self.parse_create_view_params()?;
         if self.peek_keywords(&[Keyword::SNAPSHOT, Keyword::TABLE]) {
             self.parse_create_snapshot_table().map(Into::into)
+        } else if self.peek_keywords(&[Keyword::UNLOGGED, Keyword::TABLE]) {
+            self.expect_keywords(&[Keyword::UNLOGGED, Keyword::TABLE])?;
+            self.parse_create_table(or_replace, temporary, true, global, transient)
+                .map(Into::into)
         } else if self.parse_keyword(Keyword::TABLE) {
-            self.parse_create_table(or_replace, temporary, unlogged, global, transient)
+            self.parse_create_table(or_replace, temporary, false, global, transient)
                 .map(Into::into)
-        } else if unlogged {
-            self.expected_ref("TABLE after UNLOGGED", self.peek_token_ref())
         } else if self.peek_keyword(Keyword::MATERIALIZED)
             || self.peek_keyword(Keyword::VIEW)
             || self.peek_keywords(&[Keyword::SECURE, Keyword::MATERIALIZED, Keyword::VIEW])
@@ -10670,13 +10670,9 @@ impl<'a> Parser<'a> {
         } else if self.parse_keywords(&[Keyword::VALIDATE, Keyword::CONSTRAINT]) {
             let name = self.parse_identifier()?;
             AlterTableOperation::ValidateConstraint { name }
-        } else if dialect_of!(self is PostgreSqlDialect | GenericDialect)
-            && self.parse_keywords(&[Keyword::SET, Keyword::LOGGED])
-        {
+        } else if self.parse_keywords(&[Keyword::SET, Keyword::LOGGED]) {
             AlterTableOperation::SetLogged
-        } else if dialect_of!(self is PostgreSqlDialect | GenericDialect)
-            && self.parse_keywords(&[Keyword::SET, Keyword::UNLOGGED])
-        {
+        } else if self.parse_keywords(&[Keyword::SET, Keyword::UNLOGGED]) {
             AlterTableOperation::SetUnlogged
         } else {
             let mut options =

tests/sqlparser_common.rs

@@ -18890,3 +18890,27 @@ fn parse_non_pg_dialects_keep_xml_names_as_regular_identifiers() {
     let dialects = all_dialects_except(|d| d.supports_xml_expressions());
     dialects.verified_only_select("SELECT xml FROM t");
 }
+
+#[test]
+fn parse_unlogged_table_logging_controls_in_all_dialects() {
+    match all_dialects().verified_stmt("CREATE UNLOGGED TABLE t (a INT)") {
+        Statement::CreateTable(CreateTable { unlogged, .. }) => {
+            assert!(unlogged);
+        }
+        _ => unreachable!("Expected CREATE TABLE"),
+    }
+
+    match all_dialects().verified_stmt("ALTER TABLE t SET LOGGED") {
+        Statement::AlterTable(AlterTable { operations, .. }) => {
+            assert_eq!(vec![AlterTableOperation::SetLogged], operations);
+        }
+        _ => unreachable!("Expected ALTER TABLE"),
+    }
+
+    match all_dialects().verified_stmt("ALTER TABLE t SET UNLOGGED") {
+        Statement::AlterTable(AlterTable { operations, .. }) => {
+            assert_eq!(vec![AlterTableOperation::SetUnlogged], operations);
+        }
+        _ => unreachable!("Expected ALTER TABLE"),
+    }
+}

tests/sqlparser_postgres.rs

@@ -5763,11 +5763,10 @@ fn parse_create_unlogged_table() {
         _ => unreachable!(),
     }
 
-    // Negative test: UNLOGGED without TABLE should error
     let res = pg().parse_sql_statements("CREATE UNLOGGED VIEW v AS SELECT 1");
-    assert!(
-        res.is_err(),
-        "CREATE UNLOGGED should only be followed by TABLE"
+    assert_eq!(
+        ParserError::ParserError("Expected: an object type after CREATE, found: UNLOGGED".into()),
+        res.unwrap_err()
     );
 }