Merge pull request #2631 from ClickHouse/fix_antlr4_filter_expression

fixed aggregate function with filter clause

Author: chernser

jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/parser/antlr4/ClickHouseLexer.g4

@@ -114,6 +114,7 @@ FETCHES      : F E T C H E S;
 FETCH : F E T C H ;
 FILE : F I L E;
 FILESYSTEM : F I L E S Y S T E M ;
+FILTER : F I L T E R;
 FINAL        : F I N A L;
 FIRST        : F I R S T;
 FLUSH        : F L U S H;

jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/parser/antlr4/ClickHouseParser.g4

@@ -1069,6 +1069,7 @@ columnExpr
     | TRIM LPAREN (BOTH | LEADING | TRAILING) STRING_LITERAL FROM columnExpr RPAREN      # ColumnExprTrim
     | identifier (LPAREN columnExprList? RPAREN) OVER LPAREN windowExpr RPAREN           # ColumnExprWinFunction
     | identifier (LPAREN columnExprList? RPAREN) OVER identifier                         # ColumnExprWinFunctionTarget
+    | identifier (LPAREN columnExprList? RPAREN) FILTER LPAREN whereClause RPAREN        # ColumnExprAgrFuncWithFilter
     | identifier (LPAREN columnExprList? RPAREN)? LPAREN DISTINCT? columnArgList? RPAREN # ColumnExprFunction
     | literal                                                                            # ColumnExprLiteral
 

jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/BaseSqlParserFacadeTest.java

@@ -356,6 +356,9 @@ public Object[][] testMiscStmtDp() {
                     "              arrayConcat(t.s.arr1, t.s.arr2)" +
                     "              )" +
                     ")", 0},
+            {"select count(*) filter (where 1 = 1)", 0},
+            {"select countIf(*, 1 = ?)", 1},
+            {"select count(*) filter (where 1 = ?)", 1}
         };
     }