Allow not having a target for on conflict

donga-gao · Feb 17, 2023 · 5c0d160 · 5c0d160
1 parent 8033bda
commit 5c0d160
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/insert_replace.rs b/src/insert_replace.rs
@@ -65,16 +65,18 @@ pub enum OnConflictTarget<'a> {
         on_constraint_span: Span,
         name: Identifier<'a>,
     },
+    None,
 }
 
-impl<'a> Spanned for OnConflictTarget<'a> {
-    fn span(&self) -> Span {
+impl<'a> OptSpanned for OnConflictTarget<'a> {
+    fn opt_span(&self) -> Option<Span> {
         match self {
-            OnConflictTarget::Column { name } => name.span(),
+            OnConflictTarget::Column { name } => Some(name.span()),
             OnConflictTarget::OnConstraint {
                 on_constraint_span: token,
                 name,
-            } => token.join_span(name),
+            } => Some(token.join_span(name)),
+            OnConflictTarget::None => None,
         }
     }
 }
@@ -395,7 +397,7 @@ pub(crate) fn parse_insert_replace<'a, 'b>(
                                 name,
                             }
                         }
-                        _ => parser.expected_failure("( or ON")?,
+                        _ => OnConflictTarget::None,
                     };
 
                     let do_ = parser.consume_keyword(Keyword::DO)?;