feat: Allow to use >> and << binary operators in Generic dialect

sqlparser-rs · Aug 4, 2022 · e897a91 · e897a91
1 parent 076b587
commit e897a91
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/parser.rs b/src/parser.rs
@@ -1145,10 +1145,10 @@ impl<'a> Parser<'a> {
             Token::Caret => Some(BinaryOperator::BitwiseXor),
             Token::Ampersand => Some(BinaryOperator::BitwiseAnd),
             Token::Div => Some(BinaryOperator::Divide),
-            Token::ShiftLeft if dialect_of!(self is PostgreSqlDialect) => {
+            Token::ShiftLeft if dialect_of!(self is GenericDialect | PostgreSqlDialect) => {
                 Some(BinaryOperator::PGBitwiseShiftLeft)
             }
-            Token::ShiftRight if dialect_of!(self is PostgreSqlDialect) => {
+            Token::ShiftRight if dialect_of!(self is GenericDialect | PostgreSqlDialect) => {
                 Some(BinaryOperator::PGBitwiseShiftRight)
             }
             Token::Sharp if dialect_of!(self is PostgreSqlDialect) => {

diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs
@@ -24,8 +24,8 @@ mod test_utils;
 use matches::assert_matches;
 use sqlparser::ast::*;
 use sqlparser::dialect::{
-    AnsiDialect, BigQueryDialect, GenericDialect, HiveDialect, MsSqlDialect, PostgreSqlDialect,
-    SQLiteDialect, SnowflakeDialect,
+    AnsiDialect, BigQueryDialect, ClickHouseDialect, GenericDialect, HiveDialect, MsSqlDialect,
+    PostgreSqlDialect, SQLiteDialect, SnowflakeDialect,
 };
 use sqlparser::keywords::ALL_KEYWORDS;
 use sqlparser::parser::{Parser, ParserError};
@@ -555,7 +555,7 @@ fn test_eof_after_as() {
 
 #[test]
 fn test_no_infix_error() {
-    let res = Parser::parse_sql(&GenericDialect {}, "ASSERT-URA<<");
+    let res = Parser::parse_sql(&ClickHouseDialect {}, "ASSERT-URA<<");
     assert_eq!(
         ParserError::ParserError("No infix parser for token ShiftLeft".to_string()),
         res.unwrap_err()

diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs
@@ -1077,13 +1077,14 @@ fn parse_prepare() {
 #[test]
 fn parse_pg_bitwise_binary_ops() {
     let bitwise_ops = &[
-        ("#", BinaryOperator::PGBitwiseXor),
-        (">>", BinaryOperator::PGBitwiseShiftRight),
-        ("<<", BinaryOperator::PGBitwiseShiftLeft),
+        // Sharp char cannot be used with Generic Dialect, it conflicts with identifiers
+        ("#", BinaryOperator::PGBitwiseXor, pg()),
+        (">>", BinaryOperator::PGBitwiseShiftRight, pg_and_generic()),
+        ("<<", BinaryOperator::PGBitwiseShiftLeft, pg_and_generic()),
     ];
 
-    for (str_op, op) in bitwise_ops {
-        let select = pg().verified_only_select(&format!("SELECT a {} b", &str_op));
+    for (str_op, op, dialects) in bitwise_ops {
+        let select = dialects.verified_only_select(&format!("SELECT a {} b", &str_op));
         assert_eq!(
             SelectItem::UnnamedExpr(Expr::BinaryOp {
                 left: Box::new(Expr::Identifier(Ident::new("a"))),