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
2 changes: 1 addition & 1 deletion .github/workflows/unmanaged_dependency_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
shell: bash
run: .kokoro/build.sh
- name: Unmanaged dependency check
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.45.1
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.46.0
with:
bom-path: pom.xml
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-17.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.45.1"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.0"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.45.1"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.0"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>sdk-platform-java-config</artifactId>
<version>3.45.1</version>
<version>3.46.0</version>
</parent>
<developers>
<developer>
Expand Down
2 changes: 1 addition & 1 deletion samples/quickperf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>sdk-platform-java-config</artifactId>
<version>3.45.1</version>
<version>3.46.0</version>
<relativePath/>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion samples/snippets/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>sdk-platform-java-config</artifactId>
<version>3.45.1</version>
<version>3.46.0</version>
<relativePath/>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,13 @@ Statement addReturningToStatement(Statement statement, ImmutableList<String> gen
if (generatedKeysColumns.size() == 1
&& ALL_COLUMNS.get(0).equals(generatedKeysColumns.get(0))) {
// Add a 'THEN RETURN/RETURNING *' clause to the statement.
return statement
.toBuilder()
return statement.toBuilder()
.replace(statement.getSql() + getReturningAllColumnsClause())
.build();
}
// Add a 'THEN RETURN/RETURNING col1, col2, ...' to the statement.
// The column names will be quoted using the dialect-specific identifier quoting character.
return statement
.toBuilder()
return statement.toBuilder()
.replace(
generatedKeysColumns.stream()
.map(this::quoteColumn)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,7 @@ public void testInsertAllTypes() {
if (dialect == Dialect.POSTGRESQL) {
Statement insertStatement = createInsertStatement(dialect);
insertStatement =
insertStatement
.toBuilder()
insertStatement.toBuilder()
.replace(insertStatement.getSql().replaceAll("@p", "\\$"))
.bind("p16")
.to(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,22 +176,19 @@ public void setupResults() {
mockSpanner.putStatementResult(
StatementResult.query(
com.google.cloud.spanner.Statement.of(dmlReturning),
resultSet
.toBuilder()
resultSet.toBuilder()
.setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build())
.build()));
mockSpanner.putStatementResult(
StatementResult.query(
com.google.cloud.spanner.Statement.of(DML_THEN_RETURN_ID),
returnIdResultSet
.toBuilder()
returnIdResultSet.toBuilder()
.setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build())
.build()));
mockSpanner.putStatementResult(
StatementResult.query(
com.google.cloud.spanner.Statement.of(LARGE_DML_THEN_RETURN_ID),
returnIdResultSet
.toBuilder()
returnIdResultSet.toBuilder()
.setStats(
ResultSetStats.newBuilder().setRowCountExact(LARGE_UPDATE_COUNT).build())
.build()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,13 @@ public void setupResults() {
mockSpanner.putStatementResult(
StatementResult.query(
com.google.cloud.spanner.Statement.of(dmlReturning),
resultSet
.toBuilder()
resultSet.toBuilder()
.setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build())
.build()));
mockSpanner.putStatementResult(
StatementResult.query(
com.google.cloud.spanner.Statement.of(DML_THEN_RETURN_ID),
returnIdResultSet
.toBuilder()
returnIdResultSet.toBuilder()
.setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build())
.build()));
}
Expand Down