@@ -3832,7 +3832,9 @@ impl<'a> Parser<'a> {
3832
3832
] ) {
3833
3833
Some ( Keyword :: UPDATE ) => {
3834
3834
if is_not_matched {
3835
- parser_err ! ( "UPDATE in NOT MATCHED merge clause" ) ?;
3835
+ return Err ( ParserError :: ParserError (
3836
+ "UPDATE in NOT MATCHED merge clause" . to_string ( ) ,
3837
+ ) ) ;
3836
3838
}
3837
3839
self . expect_keyword ( Keyword :: SET ) ?;
3838
3840
let assignments = self . parse_comma_separated ( Parser :: parse_assignment) ?;
@@ -3843,13 +3845,17 @@ impl<'a> Parser<'a> {
3843
3845
}
3844
3846
Some ( Keyword :: DELETE ) => {
3845
3847
if is_not_matched {
3846
- parser_err ! ( "DELETE in NOT MATCHED merge clause" ) ?;
3848
+ return Err ( ParserError :: ParserError (
3849
+ "DELETE in NOT MATCHED merge clause" . to_string ( ) ,
3850
+ ) ) ;
3847
3851
}
3848
3852
MergeClause :: MatchedDelete ( predicate)
3849
3853
}
3850
3854
Some ( Keyword :: INSERT ) => {
3851
3855
if !is_not_matched {
3852
- parser_err ! ( "INSERT in MATCHED merge clause" ) ?;
3856
+ return Err ( ParserError :: ParserError (
3857
+ "INSERT in MATCHED merge clause" . to_string ( ) ,
3858
+ ) ) ;
3853
3859
}
3854
3860
let columns = self . parse_parenthesized_column_list ( Optional ) ?;
3855
3861
self . expect_keyword ( Keyword :: VALUES ) ?;
@@ -3860,8 +3866,16 @@ impl<'a> Parser<'a> {
3860
3866
values,
3861
3867
}
3862
3868
}
3863
- Some ( _) => parser_err ! ( "expected UPDATE, DELETE or INSERT in merge clause" ) ?,
3864
- None => parser_err ! ( "expected UPDATE, DELETE or INSERT in merge clause" ) ?,
3869
+ Some ( _) => {
3870
+ return Err ( ParserError :: ParserError (
3871
+ "expected UPDATE, DELETE or INSERT in merge clause" . to_string ( ) ,
3872
+ ) )
3873
+ }
3874
+ None => {
3875
+ return Err ( ParserError :: ParserError (
3876
+ "expected UPDATE, DELETE or INSERT in merge clause" . to_string ( ) ,
3877
+ ) )
3878
+ }
3865
3879
} ,
3866
3880
) ;
3867
3881
}
0 commit comments