feat(sqlsmith): Support generate merge into (#13300)

* feat(sqlsmith): Support generate merge into

* fix variant display

* fix variant display

Author: b41sh

Cargo.lock

@@ -116,7 +116,7 @@ opendal = { version = "0.41", features = [
 ] }
 ethnum = { version = "1.3.2" }
 ordered-float = { version = "3.6.0", default-features = false }
-jsonb = { git = "https://github.com/datafuselabs/jsonb", rev = "b29f2ea" }
+jsonb = { version = "0.3.0" }
 
 # openraft = { version = "0.8.2", features = ["compat-07"] }
 # For debugging

Cargo.toml

@@ -100,65 +100,61 @@ pub struct MergeIntoStmt {
 
 impl Display for MergeIntoStmt {
     fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
-        write!(f, "MERGE INTO  ")?;
+        write!(f, "MERGE INTO ")?;
         write_dot_separated_list(
             f,
             self.catalog
                 .iter()
                 .chain(&self.database)
                 .chain(Some(&self.table_ident)),
         )?;
-
+        if let Some(alias) = &self.target_alias {
+            write!(f, " AS {}", alias.name)?;
+        }
         write!(f, " USING {} ON {}", self.source, self.join_expr)?;
 
         for clause in &self.merge_options {
             match clause {
                 MergeOption::Match(match_clause) => {
                     write!(f, " WHEN MATCHED ")?;
                     if let Some(e) = &match_clause.selection {
-                        write!(f, " AND {} ", e)?;
+                        write!(f, "AND {} ", e)?;
                     }
-                    write!(f, " THEN ")?;
+                    write!(f, "THEN ")?;
 
                     match &match_clause.operation {
                         MatchOperation::Update {
                             update_list,
                             is_star,
                         } => {
                             if *is_star {
-                                write!(f, " UPDATE * ")?;
+                                write!(f, "UPDATE *")?;
                             } else {
-                                write!(f, " UPDATE SET ")?;
+                                write!(f, "UPDATE SET ")?;
                                 write_comma_separated_list(f, update_list)?;
                             }
                         }
                         MatchOperation::Delete => {
-                            write!(f, " DELETE ")?;
+                            write!(f, "DELETE")?;
                         }
                     }
                 }
                 MergeOption::Unmatch(unmatch_clause) => {
                     write!(f, " WHEN NOT MATCHED ")?;
                     if let Some(e) = &unmatch_clause.selection {
-                        write!(f, " AND {} ", e)?;
+                        write!(f, "AND {} ", e)?;
                     }
-                    write!(f, " THEN INSERT ")?;
+                    write!(f, "THEN INSERT")?;
                     if let Some(columns) = &unmatch_clause.insert_operation.columns {
                         if !columns.is_empty() {
                             write!(f, " (")?;
                             write_comma_separated_list(f, columns)?;
                             write!(f, ")")?;
                         }
                     }
-                    write!(f, "VALUES")?;
-                    for (i, value) in unmatch_clause.insert_operation.values.iter().enumerate() {
-                        if i > 0 {
-                            write!(f, ", ")?;
-                        }
-                        write!(f, "(")?;
-                        write_comma_separated_list(f, vec![value])?;
-                        write!(f, ")")?;
-                    }
+                    write!(f, " VALUES(")?;
+                    write_comma_separated_list(f, unmatch_clause.insert_operation.values.clone())?;
+                    write!(f, ")")?;
                 }
             }
         }
@@ -273,7 +269,7 @@ impl Display for MergeSource {
             MergeSource::Select {
                 query,
                 source_alias,
-            } => write!(f, "{query} as {source_alias}"),
+            } => write!(f, "({query}) AS {source_alias}"),
         }
     }
 }

src/query/ast/src/ast/statements/merge_into.rs

@@ -155,7 +155,7 @@ pub fn statement(i: Input) -> IResult<StatementMsg> {
 
     let merge = map(
         rule! {
-            MERGE ~ #hint? ~ INTO ~ #dot_separated_idents_1_to_3  ~ #table_alias? ~ USING
+            MERGE ~ #hint? ~ INTO ~ #dot_separated_idents_1_to_3 ~ #table_alias? ~ USING
             ~ #merge_source ~ ON ~ #expr ~ (#match_clause | #unmatch_clause)*
         },
         |(