Use Option

Author: alamb

src/ast/mod.rs

@@ -39,13 +39,13 @@ pub use self::ddl::{
 };
 pub use self::operator::{BinaryOperator, UnaryOperator};
 pub use self::query::{
-    Cte, CteAsMaterialized, Distinct, ExceptSelectItem, ExcludeSelectItem, Fetch, ForClause, ForJson, ForXml,
-    GroupByExpr, IdentWithAlias, Join, JoinConstraint, JoinOperator, JsonTableColumn,
-    JsonTableColumnErrorHandling, LateralView, LockClause, LockType, NamedWindowDefinition,
-    NonBlock, Offset, OffsetRows, OrderByExpr, Query, RenameSelectItem, ReplaceSelectElement,
-    ReplaceSelectItem, Select, SelectInto, SelectItem, SetExpr, SetOperator, SetQuantifier, Table,
-    TableAlias, TableFactor, TableVersion, TableWithJoins, Top, TopQuantity, ValueTableMode,
-    Values, WildcardAdditionalOptions, With,
+    Cte, CteAsMaterialized, Distinct, ExceptSelectItem, ExcludeSelectItem, Fetch, ForClause,
+    ForJson, ForXml, GroupByExpr, IdentWithAlias, Join, JoinConstraint, JoinOperator,
+    JsonTableColumn, JsonTableColumnErrorHandling, LateralView, LockClause, LockType,
+    NamedWindowDefinition, NonBlock, Offset, OffsetRows, OrderByExpr, Query, RenameSelectItem,
+    ReplaceSelectElement, ReplaceSelectItem, Select, SelectInto, SelectItem, SetExpr, SetOperator,
+    SetQuantifier, Table, TableAlias, TableFactor, TableVersion, TableWithJoins, Top, TopQuantity,
+    ValueTableMode, Values, WildcardAdditionalOptions, With,
 };
 pub use self::value::{
     escape_quoted_string, DateTimeField, DollarQuotedString, TrimWhereField, Value,

src/ast/query.rs

@@ -387,20 +387,15 @@ impl fmt::Display for With {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub enum CteAsMaterialized {
-    /// The WITH statement does not specify MATERIALIZED behavior
-    Default,
-    /// The WITH statement  specifies AS MATERIALIZED behavior
+    /// The `WITH` statement specifies `AS MATERIALIZED` behavior
     Materialized,
-    /// The WITH statement  specifies AS NOT MATERIALIZED behavior
+    /// The `WITH` statement specifies `AS NOT MATERIALIZED` behavior
     NotMaterialized,
 }
 
 impl fmt::Display for CteAsMaterialized {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
-            CteAsMaterialized::Default => {
-                write!(f, "")?;
-            }
             CteAsMaterialized::Materialized => {
                 write!(f, "MATERIALIZED")?;
             }
@@ -423,20 +418,15 @@ pub struct Cte {
     pub alias: TableAlias,
     pub query: Box<Query>,
     pub from: Option<Ident>,
-    pub materialized: CteAsMaterialized,
+    pub materialized: Option<CteAsMaterialized>,
 }
 
 impl fmt::Display for Cte {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        if matches!(self.materialized, CteAsMaterialized::Default) {
-            write!(f, "{} AS ({})", self.alias, self.query)?;
-        } else {
-            write!(
-                f,
-                "{} AS {} ({})",
-                self.alias, self.materialized, self.query
-            )?;
-        }
+        match self.materialized.as_ref() {
+            None => write!(f, "{} AS ({})", self.alias, self.query)?,
+            Some(materialized) => write!(f, "{} AS {materialized} ({})", self.alias, self.query)?,
+        };
         if let Some(ref fr) = self.from {
             write!(f, " FROM {fr}")?;
         }

src/parser/mod.rs

@@ -6719,12 +6719,12 @@ impl<'a> Parser<'a> {
         let name = self.parse_identifier(false)?;
 
         let mut cte = if self.parse_keyword(Keyword::AS) {
-            let mut is_materialized = CteAsMaterialized::Default;
+            let mut is_materialized = None;
             if dialect_of!(self is PostgreSqlDialect) {
                 if self.parse_keyword(Keyword::MATERIALIZED) {
-                    is_materialized = CteAsMaterialized::Materialized;
+                    is_materialized = Some(CteAsMaterialized::Materialized);
                 } else if self.parse_keywords(&[Keyword::NOT, Keyword::MATERIALIZED]) {
-                    is_materialized = CteAsMaterialized::NotMaterialized;
+                    is_materialized = Some(CteAsMaterialized::NotMaterialized);
                 }
             }
             self.expect_token(&Token::LParen)?;
@@ -6743,12 +6743,12 @@ impl<'a> Parser<'a> {
         } else {
             let columns = self.parse_parenthesized_column_list(Optional, false)?;
             self.expect_keyword(Keyword::AS)?;
-            let mut is_materialized = CteAsMaterialized::Default;
+            let mut is_materialized = None;
             if dialect_of!(self is PostgreSqlDialect) {
                 if self.parse_keyword(Keyword::MATERIALIZED) {
-                    is_materialized = CteAsMaterialized::Materialized;
+                    is_materialized = Some(CteAsMaterialized::Materialized);
                 } else if self.parse_keywords(&[Keyword::NOT, Keyword::MATERIALIZED]) {
-                    is_materialized = CteAsMaterialized::NotMaterialized;
+                    is_materialized = Some(CteAsMaterialized::NotMaterialized);
                 }
             }
             self.expect_token(&Token::LParen)?;

tests/sqlparser_common.rs

@@ -5589,7 +5589,7 @@ fn parse_recursive_cte() {
         },
         query: Box::new(cte_query),
         from: None,
-        materialized: CteAsMaterialized::Default,
+        materialized: None,
     };
     assert_eq!(with.cte_tables.first().unwrap(), &expected);
 }