Finished renaming to ConstraintReferenceMatchKind

Author: LucaCappelletti94

src/ast/mod.rs

@@ -670,12 +670,12 @@ pub enum ConstraintReferenceMatchKind {
     Simple,
 }
 
-impl fmt::Display for MatchKind {
+impl fmt::Display for ConstraintReferenceMatchKind {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            MatchKind::Full => write!(f, "MATCH FULL"),
-            MatchKind::Partial => write!(f, "MATCH PARTIAL"),
-            MatchKind::Simple => write!(f, "MATCH SIMPLE"),
+            Self::Full => write!(f, "MATCH FULL"),
+            Self::Partial => write!(f, "MATCH PARTIAL"),
+            Self::Simple => write!(f, "MATCH SIMPLE"),
         }
     }
 }

src/ast/table_constraints.rs

@@ -19,7 +19,7 @@
 
 use crate::ast::{
     display_comma_separated, display_separated, ConstraintCharacteristics, Expr, Ident,
-    IndexColumn, IndexOption, IndexType, KeyOrIndexDisplay, MatchKind, NullsDistinctOption,
+    IndexColumn, IndexOption, IndexType, KeyOrIndexDisplay, ConstraintReferenceMatchKind, NullsDistinctOption,
     ObjectName, ReferentialAction,
 };
 use crate::tokenizer::Span;
@@ -206,7 +206,7 @@ pub struct ForeignKeyConstraint {
     pub referred_columns: Vec<Ident>,
     pub on_delete: Option<ReferentialAction>,
     pub on_update: Option<ReferentialAction>,
-    pub match_kind: Option<MatchKind>,
+    pub match_kind: Option<ConstraintReferenceMatchKind>,
     pub characteristics: Option<ConstraintCharacteristics>,
 }
 

src/parser/mod.rs

@@ -8357,13 +8357,13 @@ impl<'a> Parser<'a> {
         }
     }
 
-    pub fn parse_match_kind(&mut self) -> Result<MatchKind, ParserError> {
+    pub fn parse_match_kind(&mut self) -> Result<ConstraintReferenceMatchKind, ParserError> {
         if self.parse_keyword(Keyword::FULL) {
-            Ok(MatchKind::Full)
+            Ok(ConstraintReferenceMatchKind::Full)
         } else if self.parse_keyword(Keyword::PARTIAL) {
-            Ok(MatchKind::Partial)
+            Ok(ConstraintReferenceMatchKind::Partial)
         } else if self.parse_keyword(Keyword::SIMPLE) {
-            Ok(MatchKind::Simple)
+            Ok(ConstraintReferenceMatchKind::Simple)
         } else {
             self.expected("one of FULL, PARTIAL or SIMPLE", self.peek_token())
         }

tests/sqlparser_postgres.rs

@@ -6663,7 +6663,7 @@ fn parse_foreign_key_match_full() {
             match &columns[0].options[1].option {
                 ColumnOption::ForeignKey(constraint) => {
                     assert_eq!(constraint.foreign_table.to_string(), "another_table");
-                    assert_eq!(constraint.match_kind, Some(MatchKind::Full));
+                    assert_eq!(constraint.match_kind, Some(ConstraintReferenceMatchKind::Full));
                 }
                 _ => panic!("Expected ColumnOption::ForeignKey"),
             }
@@ -6672,7 +6672,7 @@ fn parse_foreign_key_match_full() {
             match &constraints[0] {
                 TableConstraint::ForeignKey(constraint) => {
                     assert_eq!(constraint.foreign_table.to_string(), "customers");
-                    assert_eq!(constraint.match_kind, Some(MatchKind::Full));
+                    assert_eq!(constraint.match_kind, Some(ConstraintReferenceMatchKind::Full));
                 }
                 _ => panic!("Expected TableConstraint::ForeignKey"),
             }
@@ -6696,7 +6696,7 @@ fn parse_foreign_key_match_simple() {
             match &columns[0].options[1].option {
                 ColumnOption::ForeignKey(constraint) => {
                     assert_eq!(constraint.foreign_table.to_string(), "another_table");
-                    assert_eq!(constraint.match_kind, Some(MatchKind::Simple));
+                    assert_eq!(constraint.match_kind, Some(ConstraintReferenceMatchKind::Simple));
                 }
                 _ => panic!("Expected ColumnOption::ForeignKey"),
             }
@@ -6705,7 +6705,7 @@ fn parse_foreign_key_match_simple() {
             match &constraints[0] {
                 TableConstraint::ForeignKey(constraint) => {
                     assert_eq!(constraint.foreign_table.to_string(), "customers");
-                    assert_eq!(constraint.match_kind, Some(MatchKind::Simple));
+                    assert_eq!(constraint.match_kind, Some(ConstraintReferenceMatchKind::Simple));
                 }
                 _ => panic!("Expected TableConstraint::ForeignKey"),
             }
@@ -6728,15 +6728,15 @@ fn parse_foreign_key_match_partial() {
             match &columns[0].options[1].option {
                 ColumnOption::ForeignKey(constraint) => {
                     assert_eq!(constraint.foreign_table.to_string(), "another_table");
-                    assert_eq!(constraint.match_kind, Some(MatchKind::Partial));
+                    assert_eq!(constraint.match_kind, Some(ConstraintReferenceMatchKind::Partial));
                 }
                 _ => panic!("Expected ColumnOption::ForeignKey"),
             }
 
             match &constraints[0] {
                 TableConstraint::ForeignKey(constraint) => {
                     assert_eq!(constraint.foreign_table.to_string(), "customers");
-                    assert_eq!(constraint.match_kind, Some(MatchKind::Partial));
+                    assert_eq!(constraint.match_kind, Some(ConstraintReferenceMatchKind::Partial));
                 }
                 _ => panic!("Expected TableConstraint::ForeignKey"),
             }