Merge branch 'main' into pre_0.9.7

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/ClientConfigProperties.java

@@ -239,7 +239,7 @@ public <T> T getDefObjVal() {
     // Key used to identify default value in configuration map
     public static final String DEFAULT_KEY = "_default_";
 
-    public static final String NO_THROW_ON_UNKNOWN_CONFIG = "no_throw_on_unknown_config";
+    public static final String IGNORE_UNKNOWN_CONFIG_KEY = "ignore_unknown_config_key";
 
     public static String serverSetting(String key) {
         return SERVER_SETTING_PREFIX + key;
@@ -363,10 +363,10 @@ public static Map<String, Object> parseConfigMap(Map<String, String> configMap)
             }
         }
 
-        tmpMap.remove(ClientConfigProperties.NO_THROW_ON_UNKNOWN_CONFIG);
+        tmpMap.remove(ClientConfigProperties.IGNORE_UNKNOWN_CONFIG_KEY);
         if (!tmpMap.isEmpty()) {
             String msg = "Unknown and unmapped config properties: " + tmpMap.keySet();
-            if (configMap.containsKey(NO_THROW_ON_UNKNOWN_CONFIG)) {
+            if (Boolean.parseBoolean(String.valueOf(configMap.get(IGNORE_UNKNOWN_CONFIG_KEY)))) {
                 LOG.warn(msg);
             } else {
                 throw new ClientMisconfigurationException(msg);

client-v2/src/test/java/com/clickhouse/client/ClientTests.java

@@ -502,7 +502,7 @@ public void testUnknownClientSettings() throws Exception {
             Assert.assertTrue(ex.getMessage().contains("unknown_setting"));
         }
 
-        try (Client client = newClient().setOption(ClientConfigProperties.NO_THROW_ON_UNKNOWN_CONFIG, "what ever").setOption("unknown_setting", "value").build()) {
+        try (Client client = newClient().setOption(ClientConfigProperties.IGNORE_UNKNOWN_CONFIG_KEY, "true").setOption("unknown_setting", "value").build()) {
             Assert.assertTrue(client.ping());
         }
 

jdbc-v2/src/main/javacc/ClickHouseSqlParser.jj

@@ -831,7 +831,7 @@ void columnExpr(): { Token t; } {
     | (LOOKAHEAD(2) macro())+
     | LOOKAHEAD(2, { !(tokenIn(1, INF, NAN, NULL) && tokenIn(2, DOT)) }) literal()
     | LOOKAHEAD(2, { getToken(2).kind == LPAREN }) functionExpr() { token_source.funcUsed = true; }
-    | anyIdentifier() (LOOKAHEAD(2) <DOT> anyIdentifier())*
+    | anyIdentifier() (LOOKAHEAD(2) <DOT> (<CARET>)? anyIdentifier())*
 }
 
 // interested parts
@@ -930,7 +930,7 @@ Token aliasExpr(): { Token t = null; } {
 }
 
 void nestedIdentifier(): {} {
-    (<ASTERISK> | anyIdentifier()) (LOOKAHEAD(2) <DOT> (<ASTERISK> | anyIdentifier()))*
+    (<ASTERISK> | anyIdentifier()) (LOOKAHEAD(2) <DOT> (<CARET>)? (<ASTERISK> | anyIdentifier()))*
 }
 
 void tableIdentifier(boolean record): { } {
@@ -1029,7 +1029,7 @@ Token numberLiteral(): { Token t = null; StringBuilder sb = new StringBuilder();
 }
 
 void operator(): {} {
-    (<ARROW> | <ASTERISK> | <CONCAT> | <CONVERT> | <DASH> | <EQ_DOUBLE> | <EQ_SINGLE>
+    (<ARROW> | <ASTERISK> | <CARET> | <CONCAT> | <CONVERT> | <DASH> | <EQ_DOUBLE> | <EQ_SINGLE>
     | <GE> | <GT> | <LE> | <LT> | <NOT_EQ> | <PERCENT> | <PLUS> | <SLASH>)
 }
 
@@ -1286,6 +1286,7 @@ TOKEN: {
     | <RPAREN: ")">
     | <SEMICOLON: ";">
     | <SLASH: "/">
+    | <CARET: "^">
     | <#UNDERSCORE: "_">
 }
 

jdbc-v2/src/test/java/com/clickhouse/jdbc/DriverTest.java

@@ -194,6 +194,6 @@ public void testUnknownSettings() throws Exception {
         }
 
         // next should not throw exception
-        driver.connect(getEndpointString() + "?unknown_setting=1&" + ClientConfigProperties.NO_THROW_ON_UNKNOWN_CONFIG + "=1", new Properties()).close();
+        driver.connect(getEndpointString() + "?unknown_setting=1&" + ClientConfigProperties.IGNORE_UNKNOWN_CONFIG_KEY + "=true", new Properties()).close();
     }
 }

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

@@ -454,6 +454,10 @@ public Object[][] testMiscStmtDp() {
                 {"select countIf(*, 1 = ?)", 1},
                 {"select count(*) filter (where 1 = ?)", 1},
                 {WHEN_HAS_ARRAY, 0},
+                {EXTEND_JOIN_ALIAS_SYNTAX, 0},
+                {"SELECT * FROM t WHERE hasToken(message, 'DDLWorker')", 0},
+                {"SELECT * FROM t WHERE hasAllTokens(message, ['peak', 'memory'])", 0},
+                {"SELECT * FROM t WHERE hasAnyTokens(message, tokens('01442_merge_detach_attach'))", 0},
         };
     }
 
@@ -569,6 +573,11 @@ public Object[][] testMiscStmtDp() {
             "    END AS action_to_do\n" +
             "FROM db.table1";
 
+    private static final String EXTEND_JOIN_ALIAS_SYNTAX = "SELECT *\n" +
+            "FROM (SELECT 1) AS t(a)\n" +
+            "JOIN (SELECT 1) AS u(b)\n" +
+            "ON a = b";
+
     @Test(dataProvider = "testStatementWithoutResultSetDP")
     public void testStatementsForResultSet(String sql, int args, boolean hasResultSet) {
         System.out.println("sql: " + sql);
@@ -652,7 +661,8 @@ public static Object[][] testStatementWithoutResultSetDP() {
                 {"CHECK GRANT SELECT(col2) ON table_2", 0, true},
                 {"CHECK TABLE test_table", 0, true},
                 {"CHECK TABLE t0 PARTITION ID '201003' FORMAT PrettyCompactMonoBlock SETTINGS check_query_single_value_result = 0", 0, true},
-
+                {"select toJSONString(data.^header_index) from database.analyzed limit 1;", 0, true},
+                {"select toJSONString(data.^header_index), ? as text from database.analyzed limit 1;", 1, true},
 
                 /* no result set */
                 {"INSERT INTO test_table VALUES (1, ?)", 1, false},