fix conflicts

Author: wugeer

src/parser/mod.rs

@@ -2811,28 +2811,6 @@ impl<'a> Parser<'a> {
                 op: UnaryOperator::PGPostfixFactorial,
                 expr: Box::new(expr),
             })
-        } else if Token::ExclamationMark == tok && self.dialect.supports_bang_not_operator() {
-            let token = self.next_token();
-            match token.token {
-                Token::Word(_) | Token::Number(..)
-                    if !matches!(
-                        expr,
-                        Expr::Value(_)
-                            | Expr::Identifier(_)
-                            | Expr::Nested(_)
-                            | Expr::BinaryOp { .. }
-                    ) =>
-                {
-                    Ok(Expr::UnaryOp {
-                        op: UnaryOperator::BangNot,
-                        expr: Box::new(expr),
-                    })
-                }
-                _ => parser_err!(
-                    "current dialect support bang not operator, but with wrong syntax",
-                    tok.location
-                ),
-            }
         } else if Token::LBracket == tok {
             if dialect_of!(self is PostgreSqlDialect | DuckDbDialect | GenericDialect) {
                 self.parse_subscript(expr)

tests/sqlparser_common.rs

@@ -11431,9 +11431,7 @@ fn parse_bang_not() {
     for &sql in &sql_statements {
         assert_eq!(
             dialects.parse_sql_statements(sql).unwrap_err(),
-            ParserError::ParserError(
-                "current dialect support bang not operator, but with wrong syntax".to_string()
-            )
+            ParserError::ParserError("No infix parser for token ExclamationMark".to_string())
         );
     }
 
@@ -11487,7 +11485,7 @@ fn parse_factorial_operator() {
 
     // Due to the exclamation mark, which is both part of the `bang not` operator
     // and the `factorial` operator,  additional filtering not supports
-    // `bang not` operator  is required here.
+    // `bang not` operator is required here.
     let dialects =
         all_dialects_where(|d| !d.supports_factorial_operator() && !d.supports_bang_not_operator());
 
@@ -11500,16 +11498,14 @@ fn parse_factorial_operator() {
 
     // Due to the exclamation mark, which is both part of the `bang not` operator
     // and the `factorial` operator,  additional filtering supports
-    // `bang not` operator  is required here.
+    // `bang not` operator is required here.
     let dialects =
         all_dialects_where(|d| !d.supports_factorial_operator() && d.supports_bang_not_operator());
 
     for &sql in &sql_statements {
         assert_eq!(
             dialects.parse_sql_statements(sql).unwrap_err(),
-            ParserError::ParserError(
-                "current dialect support bang not operator, but with wrong syntax".to_string()
-            )
+            ParserError::ParserError("No infix parser for token ExclamationMark".to_string())
         );
     }
 }