Merge v2.2.13 fix

Author: alex268

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 * QueryService is enabled by default
 
+## 2.2.13 ##
+
+* Fixed usePrefixPath for preparing of YQL statements
+
 ## 2.2.12 ##
 
 * Added option usePrefixPath

README.md

@@ -26,14 +26,22 @@ Specify the YDB JDBC driver in the dependencies:
     <dependency>
         <groupId>tech.ydb.jdbc</groupId>
         <artifactId>ydb-jdbc-driver</artifactId>
+<<<<<<< HEAD
         <version>2.3.0</version>
+=======
+        <version>2.2.13</version>
+>>>>>>> bugfix
     </dependency>
 
     <!-- Shaded version with included dependencies -->
     <dependency>
         <groupId>tech.ydb.jdbc</groupId>
         <artifactId>ydb-jdbc-driver-shaded</artifactId>
+<<<<<<< HEAD
         <version>2.3.0</version>
+=======
+        <version>2.2.13</version>
+>>>>>>> bugfix
     </dependency>
 </dependencies>
 ```

jdbc/src/main/java/tech/ydb/jdbc/context/YdbContext.java

@@ -437,49 +437,46 @@ public YdbPreparedQuery findOrPrepareParams(YdbQuery query, YdbPrepareMode mode)
         }
 
         // try to prepare data query
-        try {
-            Map<String, Type> types = queryParamsCache.getIfPresent(query.getOriginQuery());
-            if (types == null) {
-                String yql = prefixPragma + query.getPreparedYql();
-                YdbTracer tracer = config.isTxTracedEnabled() ? YdbTracer.current() : null;
-                if (tracer != null) {
-                    tracer.trace("--> prepare data query");
-                    tracer.traceRequest(yql);
-                }
+        Map<String, Type> types = queryParamsCache.getIfPresent(query.getOriginQuery());
+        if (types == null) {
+            String yql = prefixPragma + query.getPreparedYql();
+            YdbTracer tracer = config.isTxTracedEnabled() ? YdbTracer.current() : null;
+            if (tracer != null) {
+                tracer.trace("--> prepare data query");
+                tracer.traceRequest(yql);
+            }
 
-                PrepareDataQuerySettings settings = withDefaultTimeout(new PrepareDataQuerySettings());
-                Result<DataQuery> result = retryCtx.supplyResult(
-                        session -> session.prepareDataQuery(yql, settings)
-                ).join();
+            PrepareDataQuerySettings settings = withDefaultTimeout(new PrepareDataQuerySettings());
+            Result<DataQuery> result = retryCtx.supplyResult(
+                    session -> session.prepareDataQuery(yql, settings)
+            ).join();
 
+            if (tracer != null) {
+                tracer.trace("<-- " + result.getStatus());
+            }
+            if (!result.isSuccess()) {
                 if (tracer != null) {
-                    tracer.trace("<-- " + result.getStatus());
+                    tracer.close();
                 }
-                if (!result.isSuccess()) {
-                    if (tracer != null) {
-                        tracer.close();
-                    }
-                    throw new SQLException(YdbConst.UNABLE_PREPARE_STATEMENT + result.getStatus());
-                }
-
-                types = result.getValue().types();
-                queryParamsCache.put(query.getOriginQuery(), types);
+                throw ExceptionFactory.createException("Cannot prepare data query: " + result.getStatus(),
+                        new UnexpectedResultException("Unexpected status", result.getStatus()));
             }
 
-            boolean requireBatch = mode == YdbPrepareMode.DATA_QUERY_BATCH;
-            if (requireBatch || (mode == YdbPrepareMode.AUTO && queryOptions.isDetectBatchQueries())) {
-                BatchedQuery params = BatchedQuery.tryCreateBatched(query, types);
-                if (params != null) {
-                    return params;
-                }
+            types = result.getValue().types();
+            queryParamsCache.put(query.getOriginQuery(), types);
+        }
 
-                if (requireBatch) {
-                    throw new SQLDataException(YdbConst.STATEMENT_IS_NOT_A_BATCH + query.getOriginQuery());
-                }
+        boolean requireBatch = mode == YdbPrepareMode.DATA_QUERY_BATCH;
+        if (requireBatch || (mode == YdbPrepareMode.AUTO && queryOptions.isDetectBatchQueries())) {
+            BatchedQuery params = BatchedQuery.tryCreateBatched(query, types);
+            if (params != null) {
+                return params;
+            }
+
+            if (requireBatch) {
+                throw new SQLDataException(YdbConst.STATEMENT_IS_NOT_A_BATCH + query.getOriginQuery());
             }
-            return new PreparedQuery(query, types);
-        } catch (UnexpectedResultException ex) {
-            throw ExceptionFactory.createException("Cannot prepare data query: " + ex.getMessage(), ex);
         }
+        return new PreparedQuery(query, types);
     }
 }