parse_select_into, outputclause and typos

Author: Dilovan Celik

src/ast/mod.rs

@@ -3830,7 +3830,7 @@ pub enum Statement {
         /// Specifies the actions to perform when values match or do not match.
         clauses: Vec<MergeClause>,
         // Specifies the output to save changes in MSSQL
-        output: Option<Output>,
+        output: Option<OutputClause>,
     },
     /// ```sql
     /// CACHE [ FLAG ] TABLE <table_name> [ OPTIONS('K1' = 'V1', 'K2' = V2) ] [ AS ] [ <query> ]
@@ -7908,7 +7908,7 @@ impl Display for MergeClause {
     }
 }
 
-/// A Output in the end of a 'MERGE' Statement
+/// A Output Clause in the end of a 'MERGE' Statement
 ///
 /// Example:
 /// OUTPUT $action, deleted.* INTO dbo.temp_products;
@@ -7921,9 +7921,9 @@ pub struct OutputClause {
     pub into_table: SelectInto,
 }
 
-impl fmt::Display for Output {
+impl fmt::Display for OutputClause {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let Output {
+        let OutputClause {
             select_items,
             into_table,
         } = self;

src/parser/mod.rs

@@ -14493,7 +14493,6 @@ impl<'a> Parser<'a> {
                 break;
             }
 
-
             let mut clause_kind = MergeClauseKind::Matched;
             if self.parse_keyword(Keyword::NOT) {
                 clause_kind = MergeClauseKind::NotMatched;
@@ -14586,26 +14585,31 @@ impl<'a> Parser<'a> {
         Ok(clauses)
     }
 
-    fn parse_output(&mut self) -> Result<Output, ParserError> {
+    fn parse_output(&mut self) -> Result<OutputClause, ParserError> {
         self.expect_keyword_is(Keyword::OUTPUT)?;
         let select_items = self.parse_projection()?;
         self.expect_keyword_is(Keyword::INTO)?;
+        let into_table = self.parse_select_into()?;
+
+        Ok(OutputClause {
+            select_items,
+            into_table,
+        })
+    }
+
+    fn parse_select_into(&mut self) -> Result<SelectInto, ParserError> {
         let temporary = self
             .parse_one_of_keywords(&[Keyword::TEMP, Keyword::TEMPORARY])
             .is_some();
         let unlogged = self.parse_keyword(Keyword::UNLOGGED);
         let table = self.parse_keyword(Keyword::TABLE);
         let name = self.parse_object_name(false)?;
-        let into_table = SelectInto {
+
+        Ok(SelectInto {
             temporary,
             unlogged,
             table,
             name,
-        };
-
-        Ok(Output {
-            select_items,
-            into_table,
         })
     }
 

tests/sqlparser_mssql.rs

@@ -1924,7 +1924,7 @@ fn ms_and_generic() -> TestedDialects {
 
 #[test]
 fn parse_mssql_merge_with_output() {
-    let stmt = "MERGE dso.products AS t\
+    let stmt = "MERGE dso.products AS t \
         USING dsi.products AS \
         s ON s.ProductID = t.ProductID \
         WHEN MATCHED AND \