Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions jdbc/src/main/java/tech/ydb/jdbc/settings/YdbConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,9 @@ public static YdbConfig from(String jdbcURL, Properties origin) throws SQLExcept
for (Map.Entry<String, List<String>> entry: params.entrySet()) {
String value = entry.getValue().get(entry.getValue().size() - 1);
properties.put(entry.getKey(), value);
if ("database".equalsIgnoreCase(entry.getKey())) {
if (database == null || database.isEmpty()) {
database = value.startsWith("/") ? value : "/" + value;
}
if ("database".equalsIgnoreCase(entry.getKey()) && !value.isEmpty()) {
// database as query parameter is old behaviour, but it has priority before query path
database = value.startsWith("/") ? value : "/" + value;
}
}
StringBuilder sb = new StringBuilder();
Expand Down
3 changes: 2 additions & 1 deletion jdbc/src/test/java/tech/ydb/jdbc/YdbDriverExampleTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ private static String jdbcURL() {
StringBuilder jdbc = new StringBuilder("jdbc:ydb:")
.append(ydb.useTls() ? "grpcs://" : "grpc://")
.append(ydb.endpoint())
.append("/?database=")
.append(ydb.database());

if (ydb.authToken() != null) {
jdbc.append("?").append("token=").append(ydb.authToken());
jdbc.append("&").append("token=").append(ydb.authToken());
}

return jdbc.toString();
Expand Down