Skip to content

Commit fe019b6

Browse files
committed
Merge branch 'bugfix'
2 parents c94af2e + f417d12 commit fe019b6

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77

88
* QueryService is enabled by default
99

10+
## 2.2.14 ##
11+
12+
* Fixed saKeyFile option
13+
1014
## 2.2.13 ##
1115

1216
* Fixed usePrefixPath for preparing of YQL statements

jdbc/src/main/java/tech/ydb/jdbc/impl/YdbTracerNone.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void close() { }
2626
public void markToPrint(String label) { }
2727

2828
@Override
29-
public void markToPring() { }
29+
public void markToPrint() { }
3030

3131
@Override
3232
public void setId(String id) { }

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ public GrpcTransportBuilder applyToGrpcTransport(GrpcTransportBuilder builder) {
156156
} else {
157157
builder = builder.withAuthProvider(CloudAuthHelper.getServiceAccountJsonAuthProvider(json));
158158
}
159-
builder = builder.withAuthProvider(new TokenAuthProvider(token.getValue()));
160159
usedProvider = "service account credentitals";
161160
}
162161

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private static InputStream readFile(String name, String value) throws SQLExcepti
6666

6767
if (path.startsWith(HOME_REF)) {
6868
String home = System.getProperty("user.home");
69-
path = path.substring(HOME_REF.length() - 1) + home;
69+
path = home + path.substring(HOME_REF.length() - 1);
7070
}
7171

7272
return new FileInputStream(path);

0 commit comments

Comments
 (0)