prepare 0.2.5

ClickHouse · Jan 30, 2021 · 47747d1 · 47747d1
1 parent 15b4043
commit 47747d1
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 801 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,11 @@
+0.2.5
+  * bump dependencies and include lz4 in shaded jar
+  * new API: ClickHouseRowBinaryStream.writeUInt64Array(UnsignedLong[])
+  * support column comments
+  * support explain queries
+  * fix ResultSet.findColumn(String) issue
+  * fix the issue of not being able to use NULL constant in PreparedStatement
+  * fix toLowerCase issue for Turkish
 0.2.4
   * fix FORMAT clause append for queries, ending with comment
 0.2.3

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-[![clickhouse-jdbc](https://maven-badges.herokuapp.com/maven-central/ru.yandex.clickhouse/clickhouse-jdbc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ru.yandex.clickhouse/clickhouse-jdbc) [![Build Status](https://travis-ci.org/ClickHouse/clickhouse-jdbc.svg?branch=master)](https://travis-ci.org/ClickHouse/clickhouse-jdbc)
 ClickHouse JDBC driver
 ===============
+[![clickhouse-jdbc](https://maven-badges.herokuapp.com/maven-central/ru.yandex.clickhouse/clickhouse-jdbc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ru.yandex.clickhouse/clickhouse-jdbc) ![Build Status(https://github.com/ClickHouse/clickhouse-jdbc/workflows/Build/badge.svg)](https://github.com/ClickHouse/clickhouse-jdbc/workflows/Build/badge.svg)
 
 This is a basic and restricted implementation of jdbc driver for ClickHouse.
 It has support of a minimal subset of features to be usable.
@@ -10,7 +10,7 @@ It has support of a minimal subset of features to be usable.
 <dependency>
     <groupId>ru.yandex.clickhouse</groupId>
     <artifactId>clickhouse-jdbc</artifactId>
-    <version>0.2.4</version>
+    <version>0.2.5</version>
 </dependency>
 ```
 
@@ -49,7 +49,7 @@ sth
     .addDbParam(ClickHouseQueryParam.MAX_PARALLEL_REPLICAS, 2)
     .send();
 ```
-#### Send data in binary formatd with custom user callback
+#### Send data in binary formated with custom user callback
 ```java
 import ru.yandex.clickhouse.ClickHouseStatement;
 ClickHouseStatement sth = connection.createStatement();
@@ -73,4 +73,4 @@ To build a jar with dependencies use
 `mvn package assembly:single -DskipTests=true`
 
 ### Build requirements
-In order to build the jdbc client one need to have jdk 1.6 or higher.
+In order to build the jdbc client one need to have jdk 1.7 or higher.
diff --git a/pom.xml b/pom.xml
@@ -52,16 +52,17 @@
     </developers>
 
     <properties>
-        <revision>0.2.5-SNAPSHOT</revision>
+        <revision>0.2.5</revision>
         <slf4j.version>1.7.30</slf4j.version>
         <project.current.year>2021</project.current.year>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <httpclient.version>4.5.13</httpclient.version>
         <lz4.version>1.3.0</lz4.version>
-        <jackson.version>2.9.10</jackson.version>
-        <guava.version>19.0</guava.version>
+        <jackson-core.version>2.9.10</jackson-core.version>
+        <jackson-databind.version>2.9.10.8</jackson-databind.version>
+        <guava.version>29.0-jre</guava.version>
         <jaxb.version>2.3.1</jaxb.version>
-        <antlr4.version>4.9.1</antlr4.version>
+        <jdk.version>1.7</jdk.version>
         <testcontainers.version>1.15.1</testcontainers.version>
         <testng.version>6.14.3</testng.version>
         <mockito.version>1.10.19</mockito.version>
@@ -104,12 +105,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
+            <version>${jackson-core.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
+            <version>${jackson-databind.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -127,12 +128,6 @@
             <version>${jaxb.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr4-runtime</artifactId>
-            <version>${antlr4.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
@@ -255,56 +250,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.antlr</groupId>
-                <artifactId>antlr4-maven-plugin</artifactId>
-                <version>${antlr4.version}</version>
-                <configuration>
-                    <arguments>
-                        <argument>-visitor</argument>
-                    </arguments>
-                </configuration>
-                <executions>
-                    <!-- antlr4 is overkill but it can be leveraged to test our custom sql parser
-                    <execution>
-                        <id>antlr-4</id>
-                        <goals>
-                            <goal>antlr4</goal>
-                        </goals>
-                    </execution>
-                    -->
-                    <execution>
-                        <id>antlr-test</id>
-                        <configuration>
-                            <sourceDirectory>${basedir}/src/test/antlr4</sourceDirectory>
-                            <outputDirectory>${basedir}/target/generated-test-sources-antlr/antlr4</outputDirectory>
-                        </configuration>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>antlr4</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>${helper-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>add-test-sources</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${basedir}/target/generated-test-sources-antlr/antlr4</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
@@ -342,8 +287,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${compiler-plugin.version}</version>
                 <configuration>
-                    <source>7</source>
-                    <target>7</target>
+                    <source>${jdk.version}</source>
+                    <target>${jdk.version}</target>
                     <showDeprecation>true</showDeprecation>
                     <showWarnings>true</showWarnings>
                     <fork>true</fork>

diff --git a/src/main/java/ru/yandex/clickhouse/settings/ClickHouseQueryParam.java b/src/main/java/ru/yandex/clickhouse/settings/ClickHouseQueryParam.java
@@ -2,6 +2,7 @@
 
 
 import java.sql.DriverPropertyInfo;
+import java.util.Locale;
 import java.util.Properties;
 
 public enum ClickHouseQueryParam implements DriverPropertyCreator {
@@ -284,7 +285,7 @@ public String getDescription() {
 
     @Override
     public String toString() {
-        return name().toLowerCase();
+        return name().toLowerCase(Locale.ROOT);
     }
 
     @Override