Merge branch 'master' of github.com:zinal/ydb-jdbc-driver

Author: zinal

.github/workflows/build.yaml

@@ -12,7 +12,7 @@ on:
 jobs:
   prepare:
     name: Prepare Maven cache
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     env:
         MAVEN_ARGS: --batch-mode -Dstyle.color=always
@@ -33,7 +33,7 @@ jobs:
 
   build:
     name: Build JDBC Driver
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: prepare
 
     strategy:
@@ -103,7 +103,7 @@ jobs:
   coverage:
     if: github.repository == 'ydb-platform/ydb-jdbc-driver'
     name: Coverage JDBC Driver
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
 
     env:

.github/workflows/ci.yaml

@@ -11,7 +11,7 @@ on:
 jobs:
   prepare:
     name: Prepare Maven cache
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     env:
         MAVEN_ARGS: --batch-mode -Dstyle.color=always
@@ -47,7 +47,7 @@ jobs:
 
   build:
     name: YDB JDBC Driver CI on JDK
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: prepare
 
     strategy:
@@ -75,8 +75,10 @@ jobs:
       - name: Extract YDB JDBC Driver version
         working-directory: ./jdbc
         run: |
-          VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-          echo "JDBC_VERSION=$VERSION" >> "$GITHUB_ENV"
+          JDBC_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          SDK_VERSION=$(mvn help:evaluate -Dexpression=ydb.sdk.version -q -DforceStdout)
+          echo "JDBC_VERSION=$JDBC_VERSION" >> "$GITHUB_ENV"
+          echo "SDK_VERSION=$SDK_VERSION" >> "$GITHUB_ENV"
 
       - name: Build YDB JDBC Driver
         working-directory: ./jdbc
@@ -90,4 +92,4 @@ jobs:
 
       - name: Test examples with Maven
         working-directory: ./examples
-        run: mvn $MAVEN_ARGS -Dydb.jdbc.version=$JDBC_VERSION test
+        run: mvn $MAVEN_ARGS -Dydb.sdk.version=$SDK_VERSION -Dydb.jdbc.version=$JDBC_VERSION test

.github/workflows/publish.yaml

@@ -8,7 +8,7 @@ on:
 jobs:
   validate:
     name: Validate YDB JDBC Driver
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -52,7 +52,7 @@ jobs:
 
   publish:
     name: Publish YDB JDBC Driver
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: validate
 
     env:

CHANGELOG.md

@@ -1,3 +1,29 @@
+## 2.3.10 ##
+
+* Added .metadata folder to system tables
+* Added support of GRANT/REVOKE keywords
+
+## 2.3.9 ##
+
+* Added option 'forceJdbcParameters' to detect ? in whole query text
+* Added option 'tokenProvider' to use custom auth provider
+* Upgrade to Java SDK 2.3.13
+
+## 2.3.8 ##
+
+* Added option 'grpcCompression'
+* Added bulk upsert validation
+* All grpc calls isolated from parent context
+
+## 2.3.7 ##
+
+* Added slf4j-to-jul to shaded jar
+* Upgrade to use Java SDK v2.3.8
+
+## 2.3.6 ##
+
+* Added jdbc_table which can be converted to AS_TABLE($list)
+
 ## 2.3.5 ##
 
 * Disabled stream reader sets for SCAN queries

README.md

@@ -26,14 +26,14 @@ Specify the YDB JDBC driver in the dependencies:
     <dependency>
         <groupId>tech.ydb.jdbc</groupId>
         <artifactId>ydb-jdbc-driver</artifactId>
-        <version>2.3.5</version>
+        <version>2.3.10</version>
     </dependency>
 
     <!-- Shaded version with included dependencies -->
     <dependency>
         <groupId>tech.ydb.jdbc</groupId>
         <artifactId>ydb-jdbc-driver-shaded</artifactId>
-        <version>2.3.5</version>
+        <version>2.3.10</version>
     </dependency>
 </dependencies>
 ```

jdbc-shaded/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>tech.ydb.jdbc</groupId>
         <artifactId>ydb-jdbc-driver-parent</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>ydb-jdbc-driver-shaded</artifactId>
@@ -19,6 +19,11 @@
             <groupId>tech.ydb.jdbc</groupId>
             <artifactId>ydb-jdbc-driver</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -117,6 +122,12 @@
                                 <exclude>META-INF/*.RSA</exclude>
                             </excludes>
                         </filter>
+                        <filter>
+                            <artifact>org.slf4j:slf4j-api</artifact>
+                            <excludes>
+                                <exclude>org/slf4j/impl/**</exclude>
+                            </excludes>
+                        </filter>
                     </filters>
 
                     <relocations>

jdbc/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>tech.ydb.jdbc</groupId>
         <artifactId>ydb-jdbc-driver-parent</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>ydb-jdbc-driver</artifactId>
@@ -77,7 +77,6 @@
                     <environmentVariables>
                         <TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>
                         <YDB_DOCKER_IMAGE>ydbplatform/local-ydb:trunk</YDB_DOCKER_IMAGE>
-                        <YDB_DOCKER_FEATURE_FLAGS>enable_parameterized_decimal</YDB_DOCKER_FEATURE_FLAGS>
                     </environmentVariables>
                     <systemPropertyVariables>
                         <java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>

jdbc/src/main/java/tech/ydb/jdbc/common/ColumnInfo.java

@@ -19,16 +19,15 @@ public class ColumnInfo {
     private final boolean isNumber;
     private final boolean isNull;
 
-    public ColumnInfo(String name, Type type) {
+    public ColumnInfo(String name, TypeDescription type) {
         this.name = name;
 
-        TypeDescription desc = TypeDescription.of(type);
-        this.sqlType = desc.sqlType();
-        this.getters = desc.getters();
-        this.isOptional = desc.isOptional();
-        this.ydbType = desc.ydbType();
+        this.sqlType = type.sqlType();
+        this.getters = type.getters();
+        this.isOptional = type.isOptional();
+        this.ydbType = type.ydbType();
 
-        this.isTimestamp = ydbType == PrimitiveType.Timestamp;
+        this.isTimestamp = ydbType == PrimitiveType.Timestamp || ydbType == PrimitiveType.Timestamp64;
         this.isNumber = ydbType == PrimitiveType.Int8 || ydbType == PrimitiveType.Uint8
                 || ydbType == PrimitiveType.Int16 || ydbType == PrimitiveType.Uint16
                 || ydbType == PrimitiveType.Int32 || ydbType == PrimitiveType.Uint32
@@ -68,10 +67,11 @@ public MappingGetters.Getters getGetters() {
         return this.getters;
     }
 
-    public static ColumnInfo[] fromResultSetReader(ResultSetReader rsr) {
+    public static ColumnInfo[] fromResultSetReader(YdbTypes types, ResultSetReader rsr) {
         ColumnInfo[] columns = new ColumnInfo[rsr.getColumnCount()];
         for (int idx = 0; idx < rsr.getColumnCount(); idx += 1) {
-            columns[idx] = new ColumnInfo(rsr.getColumnName(idx), rsr.getColumnType(idx));
+            TypeDescription type = types.find(rsr.getColumnType(idx));
+            columns[idx] = new ColumnInfo(rsr.getColumnName(idx), type);
         }
         return columns;
     }

jdbc/src/main/java/tech/ydb/jdbc/common/FixedResultSetFactory.java

@@ -317,6 +317,22 @@ public Duration getInterval() {
             return value.getInterval();
         }
 
+        public LocalDate getDate32() {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        public LocalDateTime getDatetime64() {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        public Instant getTimestamp64() {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        public Duration getInterval64() {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
         @Override
         public ZonedDateTime getTzDate() {
             return value.getTzDate();