Skip to content

Commit 2087e8e

Browse files
authored
Fixed old-style connection string (#134)
2 parents bc8529b + 1c06ca3 commit 2087e8e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

jdbc/src/main/java/tech/ydb/jdbc/settings/YdbConfig.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,9 @@ public static YdbConfig from(String jdbcURL, Properties origin) throws SQLExcept
285285
for (Map.Entry<String, List<String>> entry: params.entrySet()) {
286286
String value = entry.getValue().get(entry.getValue().size() - 1);
287287
properties.put(entry.getKey(), value);
288-
if ("database".equalsIgnoreCase(entry.getKey())) {
289-
if (database == null || database.isEmpty()) {
290-
database = value.startsWith("/") ? value : "/" + value;
291-
}
288+
if ("database".equalsIgnoreCase(entry.getKey()) && !value.isEmpty()) {
289+
// database as query parameter is old behaviour, but it has priority before query path
290+
database = value.startsWith("/") ? value : "/" + value;
292291
}
293292
}
294293
StringBuilder sb = new StringBuilder();

jdbc/src/test/java/tech/ydb/jdbc/YdbDriverExampleTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ private static String jdbcURL() {
2525
StringBuilder jdbc = new StringBuilder("jdbc:ydb:")
2626
.append(ydb.useTls() ? "grpcs://" : "grpc://")
2727
.append(ydb.endpoint())
28+
.append("/?database=")
2829
.append(ydb.database());
2930

3031
if (ydb.authToken() != null) {
31-
jdbc.append("?").append("token=").append(ydb.authToken());
32+
jdbc.append("&").append("token=").append(ydb.authToken());
3233
}
3334

3435
return jdbc.toString();

0 commit comments

Comments
 (0)