Merge branch 'main' into repo_shaded_artiffact

Author: chernser

clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseColumn.java

@@ -639,6 +639,41 @@ public static ClickHouseColumn of(String columnName, String columnType) {
         return list.get(0);
     }
 
+    public static ClickHouseColumn of(ClickHouseDataType dataType) {
+        return ClickHouseColumn.of(dataType, false);
+    }
+
+    public static ClickHouseColumn of(ClickHouseDataType dataType, boolean nullable) {
+        return ClickHouseColumn.of("", dataType, nullable);
+    }
+
+    public static ClickHouseColumn nullable(ClickHouseDataType dataType) {
+        return ClickHouseColumn.of(dataType, true);
+    }
+
+    public static ClickHouseColumn string(boolean nullable) {
+        return ClickHouseColumn.of(ClickHouseDataType.String, nullable);
+    }
+
+    public static ClickHouseColumn string() {
+        return ClickHouseColumn.of(ClickHouseDataType.String, false);
+    }
+
+    public static ClickHouseColumn array(String columnName, boolean nullable, ClickHouseColumn innerColumn) {
+        return ClickHouseColumn.of(columnName, ClickHouseDataType.Array, nullable, innerColumn);
+    }
+
+    public static ClickHouseColumn map(String columnName, boolean nullable, ClickHouseDataType keyColumn, ClickHouseColumn valueColumn) {
+        return ClickHouseColumn.of(columnName, ClickHouseDataType.Map, nullable,
+                ClickHouseColumn.of(keyColumn),
+                valueColumn);
+    }
+
+    public static ClickHouseColumn tuple(String columnName, boolean nullable, ClickHouseColumn... innerColumn) {
+        return ClickHouseColumn.of(columnName, ClickHouseDataType.Tuple, nullable, innerColumn);
+    }
+
+
     public static List<ClickHouseColumn> parse(String args) {
         if (args == null || args.isEmpty()) {
             return Collections.emptyList();

…jdbc/parser/ClickHouseSqlParserTest.java …arser/ClickHouseSqlParserFacadeTest.javaclickhouse-jdbc/src/test/java/com/clickhouse/jdbc/parser/ClickHouseSqlParserTest.java renamed to clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/parser/ClickHouseSqlParserFacadeTest.java clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/parser/ClickHouseSqlParserTest.java renamed to clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/parser/ClickHouseSqlParserFacadeTest.java

@@ -20,13 +20,13 @@
 
 import com.clickhouse.client.ClickHouseConfig;
 
-public class ClickHouseSqlParserTest {
+public class ClickHouseSqlParserFacadeTest {
     private ClickHouseSqlStatement[] parse(String sql) {
         return ClickHouseSqlParser.parse(sql, new ClickHouseConfig());
     }
 
     private String loadSql(String file) {
-        InputStream inputStream = ClickHouseSqlParserTest.class.getResourceAsStream("/sqls/" + file);
+        InputStream inputStream = ClickHouseSqlParserFacadeTest.class.getResourceAsStream("/sqls/" + file);
 
         StringBuilder sql = new StringBuilder();
         try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream))) {

client-v2/src/test/java/com/clickhouse/client/datatypes/DataTypeTests.java

@@ -32,6 +32,7 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.Period;
@@ -541,6 +542,9 @@ public void testDynamicWithPrimitives() throws Exception {
                     case Decimal128:
                     case Decimal256:
                         BigDecimal tmpDec = row.getBigDecimal("field").stripTrailingZeros();
+                        if (tmpDec.divide((BigDecimal)value, RoundingMode.FLOOR).equals(BigDecimal.ONE)) {
+                            continue;
+                        }
                         strValue = tmpDec.toPlainString();
                         break;
                     case IntervalMicrosecond:
@@ -853,7 +857,7 @@ public void testTime64() throws Exception {
             return; // time64 was introduced in 25.6
         }
 
-        String table = "test_time64_type";
+        String table = "data_type_tests_time64";
         client.execute("DROP TABLE IF EXISTS " + table).get();
         client.execute(tableDefinition(table, "o_num UInt32", "t_sec Time64(0)",  "t_ms Time64(3)", "t_us Time64(6)", "t_ns Time64(9)"),
                 (CommandSettings) new CommandSettings().serverSetting("allow_experimental_time_time64_type", "1")).get();

client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java

@@ -2146,7 +2146,7 @@ public void testGetDynamicValue() throws Exception  {
                     } else if (decision == 1) {
                         return rnd.nextInt();
                     } else {
-                        return rnd.nextDouble();
+                        return rnd.nextLong();
                     }
                 }), 1000);
 

jdbc-v2/pom.xml

@@ -17,7 +17,7 @@
     <url>https://github.com/ClickHouse/clickhouse-java/tree/main/jdbc-v2</url>
 
     <properties>
-        <javacc-plugin.version>4.1.4</javacc-plugin.version>
+        <javacc-plugin.version>5.0.0</javacc-plugin.version>
         <spec.title>JDBC</spec.title>
         <spec.version>4.2</spec.version>
         <jackson.version>2.17.2</jackson.version>
@@ -187,6 +187,28 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>com.helger.maven</groupId>
+                <artifactId>ph-javacc-maven-plugin</artifactId>
+                <version>${javacc-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>jjc</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>javacc</goal>
+                        </goals>
+                        <configuration>
+                            <jdkVersion>${minJdk}</jdkVersion>
+                            <javadocFriendlyComments>true</javadocFriendlyComments>
+                            <packageName>com.clickhouse.jdbc.internal.parser.javacc</packageName>
+                            <sourceDirectory>src/main/javacc</sourceDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>
 </project>