Fixed some keyword issues

Author: chernser

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

@@ -377,6 +377,8 @@ WORKLOAD : W O R K L O A D;
 WRITABLE : W R I T A B L E;
 YEAR         : Y E A R | Y Y Y Y;
 ZKPATH : Z K P A T H;
+SUM : S U M;
+AVG : A V G;
 
 JSON_FALSE : 'false';
 JSON_TRUE  : 'true';

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

@@ -513,6 +513,7 @@ fromClause
     | FROM identifier LPAREN JDBC_PARAM_PLACEHOLDER RPAREN
     | FROM selectStmt
     | FROM identifier LPAREN viewParam (COMMA viewParam)?  RPAREN
+    | FROM tableFunctionExpr
     ;
 
 viewParam
@@ -1315,6 +1316,7 @@ keyword
     | LIVE
     | LOCAL
     | LOGS
+    | LOG
     | MATERIALIZE
     | MATERIALIZED
     | MAX
@@ -1345,6 +1347,7 @@ keyword
     | RANGE
     | RELOAD
     | REMOVE
+    | REMOTE
     | RENAME
     | REPLACE
     | REPLICA
@@ -1391,7 +1394,9 @@ keyword
     | USE
     | USING
     | USER
+    | USERS
     | UUID
+    | URL
     | VALUES
     | VIEW
     | VOLUME
@@ -1401,6 +1406,10 @@ keyword
     | WINDOW
     | WITH
     | QUERIES
+    | SUM
+    | AVG
+    | REFRESH
+    | EXPLAIN
     ;
 
 keywordForAlias

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/SqlParserFacade.java

@@ -44,7 +44,7 @@ public ParsedStatement parsedStatement(String sql) {
             }
             // TODO: set roles
             stmt.setInsert(parsedStmt.getStatementType() == StatementType.INSERT);
-            stmt.setHasErrors(false);
+            stmt.setHasErrors(parsedStmt.getStatementType() == StatementType.UNKNOWN);
             stmt.setHasResultSet(isStmtWithResultSet(parsedStmt));
             return stmt;
         }
@@ -64,7 +64,7 @@ public ParsedPreparedStatement parsePreparedStatement(String sql) {
                 stmt.setUseDatabase(parsedStmt.getDatabase());
             }
             stmt.setInsert(parsedStmt.getStatementType() == StatementType.INSERT);
-            stmt.setHasErrors(false);
+            stmt.setHasErrors(parsedStmt.getStatementType() == StatementType.UNKNOWN);
             stmt.setHasResultSet(isStmtWithResultSet(parsedStmt));
             stmt.setTable(parsedStmt.getTable());
             stmt.setInsertWithSelect(parsedStmt.containsKeyword("SELECT") && (parsedStmt.getStatementType() == StatementType.INSERT));

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

@@ -239,14 +239,28 @@ public static Object[][] testCTEStmtsDP() {
     public void testMiscStatements(String sql, int args) {
         ParsedPreparedStatement stmt = parser.parsePreparedStatement(sql);
         Assert.assertEquals(stmt.getArgCount(), args);
-        Assert.assertFalse(stmt.isHasErrors());
+        Assert.assertFalse(stmt.isHasErrors(), "Statement has errors");
     }
 
     @DataProvider
     public Object[][] testMiscStmtDp() {
         return new Object[][] {
+            {"SELECT x, a FROM (SELECT arrayJoin(['Hello', 'Goodbye']) AS x, [1, 2, 3] AS arr) ARRAY JOIN arr AS a", 0},
+            {"SELECT quantilesTiming(0.1, 0.5, 0.9)(dummy) FROM remote('127.0.0.{2,3}', 'system', 'one') GROUP BY 1 WITH TOTALS", 0}, // FROM remote issue
+            {"SELECT StartDate, sumMerge(Visits) AS Visits, uniqMerge(Users)  AS Users FROM basic_00040 GROUP BY StartDate ORDER BY StartDate", 0}, // keywords
+            {"SELECT uniq(URL) FROM test.hits WHERE TraficSourceID IN (7)", 0}, // keywords URL
             {"SELECT INTERVAL '1 day'", 0},
             {"SELECT INTERVAL 1 day", 0},
+            {"SET extremes = 1", 0},
+            {"CREATE TABLE check_query_log (N UInt32,S String) Engine = Log", 0 },
+            {"CREATE TABLE log (x UInt8) ENGINE = StripeLog", 0},
+            {"CREATE TABLE check_query_log (N UInt32,S String) Engine = MergeTree", 0 },
+            {"CREATE TABLE check_query_log (N UInt32,S String) Engine = ReplacingMergeTree", 0 },
+            {"select abs(log(e()) - 1) < 1e-8", 0},
+            {"SELECT SearchEngineID, ClientIP, count() AS c, sum(Refresh), avg(ResolutionWidth) " +
+                        " FROM test.hits_s3 WHERE SearchPhrase != '' GROUP BY SearchEngineID, ClientIP " +
+                        "   ORDER BY c DESC LIMIT 10", 0},
+            {"SELECT (id % 10) AS key, count() FROM 03279_test_database.test_table_1 GROUP BY key ORDER BY key", 0},
             {"SELECT ?", 1},
             {"(SELECT ?)", 1},
             {"SELECT * FROM table key WHERE ts = ?", 1},