Add NullInclussion as type instead of bool

Author: Vedin

src/ast/mod.rs

@@ -9633,6 +9633,26 @@ impl fmt::Display for OpenStatement {
     }
 }
 
+/// Specifies Include / Exclude NULL within UNPIVOT command.
+/// For example
+/// `UNPIVOT (column1 FOR new_column IN (col3, col4, col5, col6))`
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
+pub enum NullInclusion {
+    IncludeNulls,
+    ExcludeNulls,
+}
+
+impl fmt::Display for NullInclusion {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            NullInclusion::IncludeNulls => write!(f, "INCLUDE NULLS"),
+            NullInclusion::ExcludeNulls => write!(f, "EXCLUDE NULLS"),
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

src/ast/query.rs

@@ -1345,7 +1345,7 @@ pub enum TableFactor {
         value: Ident,
         name: Ident,
         columns: Vec<Ident>,
-        include_nulls: Option<bool>,
+        include_nulls: Option<NullInclusion>,
         alias: Option<TableAlias>,
     },
     /// A `MATCH_RECOGNIZE` operation on a table.
@@ -2024,11 +2024,7 @@ impl fmt::Display for TableFactor {
             } => {
                 write!(f, "{table} UNPIVOT")?;
                 if let Some(include_nulls) = include_nulls {
-                    if *include_nulls {
-                        write!(f, " INCLUDE NULLS ")?;
-                    } else {
-                        write!(f, " EXCLUDE NULLS ")?;
-                    }
+                    write!(f, " {include_nulls} ")?;
                 }
                 write!(
                     f,

src/parser/mod.rs

@@ -13370,10 +13370,10 @@ impl<'a> Parser<'a> {
     ) -> Result<TableFactor, ParserError> {
         let include_nulls = if self.parse_keyword(Keyword::INCLUDE) {
             self.expect_keyword_is(Keyword::NULLS)?;
-            Some(true)
+            Some(NullInclusion::IncludeNulls)
         } else if self.parse_keyword(Keyword::EXCLUDE) {
             self.expect_keyword_is(Keyword::NULLS)?;
-            Some(false)
+            Some(NullInclusion::ExcludeNulls)
         } else {
             None
         };

tests/sqlparser_common.rs

@@ -10815,7 +10815,7 @@ fn parse_unpivot_table() {
     if let Unpivot { include_nulls, .. } =
         &verified_only_select(sql_unpivot_exclude_nulls).from[0].relation
     {
-        assert_eq!(*include_nulls, Some(false));
+        assert_eq!(*include_nulls, Some(NullInclusion::ExcludeNulls));
     }
 
     assert_eq!(
@@ -10831,7 +10831,7 @@ fn parse_unpivot_table() {
     if let Unpivot { include_nulls, .. } =
         &verified_only_select(sql_unpivot_include_nulls).from[0].relation
     {
-        assert_eq!(*include_nulls, Some(true));
+        assert_eq!(*include_nulls, Some(NullInclusion::IncludeNulls));
     }
 
     assert_eq!(