Address some PR changes

Author: hntd187

src/ast/data_type.rs

@@ -61,7 +61,7 @@ pub enum DataType {
     Regclass,
     /// Text
     Text,
-    /// String (Hive)
+    /// String
     String,
     /// Bytea
     Bytea,

src/ast/mod.rs

@@ -420,6 +420,24 @@ impl fmt::Display for WindowFrameBound {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+pub enum PartitionAction {
+    ADD,
+    DROP,
+    SYNC,
+}
+
+impl fmt::Display for PartitionAction {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            PartitionAction::SYNC => f.write_str("SYNC PARTITIONS"),
+            PartitionAction::DROP => f.write_str("DROP PARTITIONS"),
+            PartitionAction::ADD => f.write_str("ADD PARTITIONS"),
+        }
+    }
+}
+
 /// A top-level statement (SELECT, INSERT, CREATE, etc.)
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -443,9 +461,7 @@ pub enum Statement {
     Msck {
         table_name: ObjectName,
         repair: bool,
-        add_partitions: bool,
-        drop_partitions: bool,
-        sync_partitions: bool,
+        partition_action: Option<PartitionAction>,
     },
     /// SELECT
     Query(Box<Query>),
@@ -589,7 +605,7 @@ pub enum Statement {
     /// CREATE DATABASE
     CreateDatabase {
         db_name: ObjectName,
-        ine: bool,
+        if_not_exists: bool,
         location: Option<String>,
         managed_location: Option<String>,
     },
@@ -610,35 +626,18 @@ impl fmt::Display for Statement {
             Statement::Msck {
                 table_name,
                 repair,
-                add_partitions,
-                drop_partitions,
-                sync_partitions,
+                partition_action,
             } => {
                 write!(
                     f,
                     "MSCK {repair}TABLE {table}",
                     repair = if *repair { "REPAIR " } else { "" },
                     table = table_name
                 )?;
-                write!(
-                    f,
-                    "{add}{drop}{sync}",
-                    add = if *add_partitions {
-                        " ADD PARTITIONS"
-                    } else {
-                        ""
-                    },
-                    drop = if *drop_partitions {
-                        " DROP PARTITIONS"
-                    } else {
-                        ""
-                    },
-                    sync = if *sync_partitions {
-                        " SYNC PARTITIONS"
-                    } else {
-                        ""
-                    }
-                )
+                if let Some(pa) = partition_action {
+                    write!(f, " {}", pa)?;
+                }
+                Ok(())
             }
             Statement::Truncate {
                 table_name,
@@ -755,12 +754,12 @@ impl fmt::Display for Statement {
             }
             Statement::CreateDatabase {
                 db_name,
-                ine,
+                if_not_exists,
                 location,
                 managed_location,
             } => {
                 write!(f, "CREATE")?;
-                if *ine {
+                if *if_not_exists {
                     write!(f, " IF NOT EXISTS")?;
                 }
                 write!(f, " {}", db_name)?;

src/parser.rs

@@ -166,26 +166,18 @@ impl Parser {
         let repair = self.parse_keyword(Keyword::REPAIR);
         self.expect_keyword(Keyword::TABLE)?;
         let table_name = self.parse_object_name()?;
-        let (mut add, mut drop, mut sync) = (false, false, false);
-        match self.parse_one_of_keywords(&[Keyword::ADD, Keyword::DROP, Keyword::SYNC]) {
-            Some(Keyword::ADD) => {
-                add = true;
-            }
-            Some(Keyword::DROP) => {
-                drop = true;
-            }
-            Some(Keyword::SYNC) => {
-                sync = true;
-            }
-            _ => (),
-        }
+        let partition_action =
+            match self.parse_one_of_keywords(&[Keyword::ADD, Keyword::DROP, Keyword::SYNC]) {
+                Some(Keyword::ADD) => Some(PartitionAction::ADD),
+                Some(Keyword::DROP) => Some(PartitionAction::DROP),
+                Some(Keyword::SYNC) => Some(PartitionAction::SYNC),
+                _ => None,
+            };
         self.expect_keyword(Keyword::PARTITIONS)?;
         Ok(Statement::Msck {
             repair,
             table_name,
-            add_partitions: add,
-            drop_partitions: drop,
-            sync_partitions: sync,
+            partition_action,
         })
     }
 
@@ -1153,7 +1145,7 @@ impl Parser {
         }
         Ok(Statement::CreateDatabase {
             db_name,
-            ine,
+            if_not_exists: ine,
             location,
             managed_location,
         })