Merge branch 'main' into zdenko/syn-3293-lineage-in-redshift-doesnt-support-distribution-styles

Author: zdenal

src/ast/ddl.rs

@@ -568,6 +568,7 @@ pub struct ColumnDef {
     pub codec: Option<Vec<Expr>>,
     pub options: Vec<ColumnOptionDef>,
     pub column_options: Vec<SqlOption>,
+    pub mask: Option<ObjectName>,
 }
 
 impl fmt::Display for ColumnDef {
@@ -589,6 +590,9 @@ impl fmt::Display for ColumnDef {
                 display_comma_separated(&self.column_options)
             )?;
         }
+        if let Some(mask) = &self.mask {
+            write!(f, " MASK {mask}")?;
+        }
         Ok(())
     }
 }

src/ast/mod.rs

@@ -372,15 +372,20 @@ pub struct StructField {
     pub field_name: Option<WithSpan<Ident>>,
     pub field_type: DataType,
     pub options: Vec<SqlOption>,
+    pub colon: bool,
 }
 
 impl fmt::Display for StructField {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         if let Some(name) = &self.field_name {
-            write!(f, "{name} {}", self.field_type)?;
-        } else {
-            write!(f, "{}", self.field_type)?;
-        };
+            if self.colon {
+                write!(f, "{name}: ")?;
+            } else {
+                write!(f, "{name} ")?;
+            }
+        }
+        write!(f, "{}", self.field_type)?;
+
         if !self.options.is_empty() {
             write!(f, " OPTIONS({})", display_comma_separated(&self.options))?;
         }
@@ -2040,6 +2045,7 @@ pub enum Statement {
         name: ObjectName,
         args: Option<Vec<OperateFunctionArg>>,
         return_type: Option<DataType>,
+        comment: Option<String>,
         /// Optional parameters.
         params: CreateFunctionBody,
     },
@@ -2590,6 +2596,7 @@ impl fmt::Display for Statement {
                 name,
                 args,
                 return_type,
+                comment,
                 params,
             } => {
                 write!(
@@ -2604,6 +2611,9 @@ impl fmt::Display for Statement {
                 if let Some(return_type) = return_type {
                     write!(f, " RETURNS {return_type}")?;
                 }
+                if let Some(comment) = comment {
+                    write!(f, " COMMENT '{comment}'")?;
+                }
                 write!(f, "{params}")?;
                 Ok(())
             }
@@ -5027,6 +5037,8 @@ pub struct CreateFunctionBody {
     pub as_: Option<FunctionDefinition>,
     /// RETURN expression
     pub return_: Option<Expr>,
+    /// RETURN SELECT
+    pub return_select_: Option<Query>,
     /// USING ... (Hive only)
     pub using: Option<CreateFunctionUsing>,
 }
@@ -5045,6 +5057,9 @@ impl fmt::Display for CreateFunctionBody {
         if let Some(expr) = &self.return_ {
             write!(f, " RETURN {expr}")?;
         }
+        if let Some(expr) = &self.return_select_ {
+            write!(f, " RETURN {expr}")?;
+        }
         if let Some(using) = &self.using {
             write!(f, " {using}")?;
         }

src/ast/query.rs

@@ -1150,7 +1150,9 @@ impl fmt::Display for Join {
                 self.relation,
                 suffix(constraint)
             ),
-            JoinOperator::CrossJoin => write!(f, " CROSS JOIN {}", self.relation),
+            JoinOperator::CrossJoin(constraint) => {
+                write!(f, " CROSS JOIN {}{}", self.relation, suffix(constraint))
+            }
             JoinOperator::LeftSemi(constraint) => write!(
                 f,
                 " {}LEFT SEMI JOIN {}{}",
@@ -1194,7 +1196,7 @@ pub enum JoinOperator {
     LeftOuter(JoinConstraint),
     RightOuter(JoinConstraint),
     FullOuter(JoinConstraint),
-    CrossJoin,
+    CrossJoin(JoinConstraint),
     /// LEFT SEMI (non-standard)
     LeftSemi(JoinConstraint),
     /// RIGHT SEMI (non-standard)

src/dialect/redshift.rs

@@ -35,6 +35,6 @@ impl Dialect for RedshiftSqlDialect {
 
     fn is_identifier_part(&self, ch: char) -> bool {
         // Extends Postgres dialect with sharp
-        PostgreSqlDialect {}.is_identifier_part(ch) || ch == '#'
+        PostgreSqlDialect {}.is_identifier_part(ch) || ch == '#' || ch == '€'
     }
 }

src/keywords.rs

@@ -385,6 +385,7 @@ define_keywords!(
     MACRO,
     MANAGEDLOCATION,
     MAP,
+    MASK,
     MATCH,
     MATCHED,
     MATERIALIZED,
@@ -608,6 +609,7 @@ define_keywords!(
     STRING,
     STRUCT,
     SUBMULTISET,
+    SUBSTR,
     SUBSTRING,
     SUBSTRING_REGEX,
     SUCCEEDS,