Skip to content

deps: update dependency com.google.cloud:google-cloud-spanner-bom to v6.79.0 #1786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 12, 2024
Merged

deps: update dependency com.google.cloud:google-cloud-spanner-bom to v6.79.0 #1786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c54696
deps: update dependency com.google.cloud:google-cloud-spanner-bom to …
renovate-bot Oct 11, 2024
09b9524
chore: rename methods to avoid name clash
olavloite Oct 12, 2024
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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
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.36.1</version>
<version>3.37.0</version>
</parent>
<developers>
<developer>
Expand Down Expand Up @@ -61,7 +61,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-spanner-bom</artifactId>
<version>6.78.0</version>
<version>6.79.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/spring-data-jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-spanner-bom</artifactId>
<version>6.78.0</version>
<version>6.79.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
7 changes: 4 additions & 3 deletions src/test/java/com/google/cloud/spanner/jdbc/ClientSideStatementHintsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,14 @@ private String createUrl() {
getPort(), "proj", "inst", "db" + (dialect == Dialect.POSTGRESQL ? "pg" : ""));
}

private Connection createConnection() throws SQLException {
@Override
protected Connection createJdbcConnection() throws SQLException {
return DriverManager.getConnection(createUrl());
}

@Test
public void testStatementTagInHint() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
try (ResultSet resultSet =
connection
.createStatement()
Expand All @@ -94,7 +95,7 @@ public void testStatementTagInHint() throws SQLException {

@Test
public void testRpcPriorityInHint() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
try (ResultSet resultSet =
connection
.createStatement()
Expand Down
55 changes: 28 additions & 27 deletions src/test/java/com/google/cloud/spanner/jdbc/ExecuteMockServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,13 +205,14 @@ private String createUrl() {
getPort(), "proj", "inst", "db");
}

private Connection createConnection() throws SQLException {
@Override
protected Connection createJdbcConnection() throws SQLException {
return DriverManager.getConnection(createUrl());
}

@Test
public void testStatementExecuteQuery() throws SQLException {
try (Connection connection = createConnection();
try (Connection connection = createJdbcConnection();
Statement statement = connection.createStatement()) {
try (ResultSet resultSet = statement.executeQuery(query)) {
verifyResultSet(resultSet);
Expand All @@ -231,7 +232,7 @@ public void testStatementExecuteQuery() throws SQLException {

@Test
public void testStatementExecuteUpdate() throws SQLException {
try (Connection connection = createConnection();
try (Connection connection = createJdbcConnection();
Statement statement = connection.createStatement()) {
assertEquals(1, statement.executeUpdate(dml));
assertEquals(0, statement.executeUpdate(DDL));
Expand All @@ -249,7 +250,7 @@ public void testStatementExecuteUpdate() throws SQLException {

@Test
public void testStatementExecuteUpdateReturnGeneratedKeys() throws SQLException {
try (Connection connection = createConnection();
try (Connection connection = createJdbcConnection();
Statement statement = connection.createStatement()) {
// TODO: Add tests for RETURN_GENERATED_KEYS when that is supported.
assertEquals(1, statement.executeUpdate(dml, Statement.NO_GENERATED_KEYS));
Expand All @@ -265,7 +266,7 @@ public void testStatementExecuteUpdateReturnGeneratedKeys() throws SQLException

@Test
public void testStatementExecuteUpdateReturnColumnNames() throws SQLException {
try (Connection connection = createConnection();
try (Connection connection = createJdbcConnection();
Statement statement = connection.createStatement()) {
assertEquals(1, statement.executeUpdate(dml, new String[] {"id"}));
assertEquals(0, statement.executeUpdate(DDL, new String[] {"id"}));
Expand All @@ -283,7 +284,7 @@ public void testStatementExecuteUpdateReturnColumnNames() throws SQLException {

@Test
public void testStatementExecuteUpdateReturnColumnIndexes() throws SQLException {
try (Connection connection = createConnection();
try (Connection connection = createJdbcConnection();
Statement statement = connection.createStatement()) {
assertEquals(1, statement.executeUpdate(dml, new int[] {1}));
assertEquals(0, statement.executeUpdate(DDL, new int[] {1}));
Expand All @@ -297,7 +298,7 @@ public void testStatementExecuteUpdateReturnColumnIndexes() throws SQLException

@Test
public void testStatementLargeExecuteUpdate() throws SQLException {
try (Connection connection = createConnection();
try (Connection connection = createJdbcConnection();
Statement statement = connection.createStatement()) {
assertEquals(1L, statement.executeLargeUpdate(dml));
assertEquals(0L, statement.executeLargeUpdate(DDL));
Expand All @@ -311,7 +312,7 @@ public void testStatementLargeExecuteUpdate() throws SQLException {

@Test
public void testStatementExecuteLargeUpdateReturnGeneratedKeys() throws SQLException {
try (Connection connection = createConnection();
try (Connection connection = createJdbcConnection();
Statement statement = connection.createStatement()) {
// TODO: Add tests for RETURN_GENERATED_KEYS when that is supported.
assertEquals(1, statement.executeLargeUpdate(dml, Statement.NO_GENERATED_KEYS));
Expand All @@ -329,7 +330,7 @@ public void testStatementExecuteLargeUpdateReturnGeneratedKeys() throws SQLExcep

@Test
public void testStatementExecuteLargeUpdateReturnColumnNames() throws SQLException {
try (Connection connection = createConnection();
try (Connection connection = createJdbcConnection();
Statement statement = connection.createStatement()) {
assertEquals(1, statement.executeLargeUpdate(dml, new String[] {"id"}));
assertEquals(0, statement.executeLargeUpdate(DDL, new String[] {"id"}));
Expand All @@ -346,7 +347,7 @@ public void testStatementExecuteLargeUpdateReturnColumnNames() throws SQLExcepti

@Test
public void testStatementExecuteLargeUpdateReturnColumnIndexes() throws SQLException {
try (Connection connection = createConnection();
try (Connection connection = createJdbcConnection();
Statement statement = connection.createStatement()) {
assertEquals(1, statement.executeLargeUpdate(dml, new int[] {1}));
assertEquals(0, statement.executeLargeUpdate(DDL, new int[] {1}));
Expand All @@ -360,7 +361,7 @@ public void testStatementExecuteLargeUpdateReturnColumnIndexes() throws SQLExcep

@Test
public void testStatementExecute() throws SQLException {
try (Connection connection = createConnection();
try (Connection connection = createJdbcConnection();
Statement statement = connection.createStatement()) {
verifyUpdateCount(statement, () -> statement.execute(dml), 1L);
verifyUpdateCount(statement, () -> statement.execute(largeDml), LARGE_UPDATE_COUNT);
Expand All @@ -375,7 +376,7 @@ public void testStatementExecute() throws SQLException {

@Test
public void testStatementExecuteReturnGeneratedKeys() throws SQLException {
try (Connection connection = createConnection();
try (Connection connection = createJdbcConnection();
Statement statement = connection.createStatement()) {
// TODO: Add tests for RETURN_GENERATED_KEYS when that is supported.
verifyUpdateCount(statement, () -> statement.execute(dml, Statement.NO_GENERATED_KEYS), 1L);
Expand All @@ -401,7 +402,7 @@ public void testStatementExecuteReturnGeneratedKeys() throws SQLException {

@Test
public void testStatementExecuteReturnColumnNames() throws SQLException {
try (Connection connection = createConnection();
try (Connection connection = createJdbcConnection();
Statement statement = connection.createStatement()) {
verifyUpdateCount(statement, () -> statement.execute(dml, new String[] {"id"}), 1L);
verifyUpdateCount(
Expand All @@ -420,7 +421,7 @@ public void testStatementExecuteReturnColumnNames() throws SQLException {

@Test
public void testStatementExecuteReturnColumnIndexes() throws SQLException {
try (Connection connection = createConnection();
try (Connection connection = createJdbcConnection();
Statement statement = connection.createStatement()) {
verifyUpdateCount(statement, () -> statement.execute(dml, new int[] {1}), 1L);
verifyUpdateCount(
Expand All @@ -439,7 +440,7 @@ public void testStatementExecuteReturnColumnIndexes() throws SQLException {

@Test
public void testPreparedStatementExecuteQuery() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
try (ResultSet resultSet = connection.prepareStatement(query).executeQuery()) {
verifyResultSet(resultSet);
}
Expand All @@ -458,7 +459,7 @@ public void testPreparedStatementExecuteQuery() throws SQLException {

@Test
public void testPreparedStatementExecuteUpdate() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
assertEquals(1, connection.prepareStatement(dml).executeUpdate());
assertEquals(0, connection.prepareStatement(DDL).executeUpdate());
assertEquals(0, connection.prepareStatement(clientSideUpdate).executeUpdate());
Expand All @@ -472,7 +473,7 @@ public void testPreparedStatementExecuteUpdate() throws SQLException {

@Test
public void testPreparedStatementExecuteUpdateReturnGeneratedKeys() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
// TODO: Add tests for RETURN_GENERATED_KEYS when that is supported.
assertEquals(
1, connection.prepareStatement(dml, Statement.NO_GENERATED_KEYS).executeUpdate());
Expand Down Expand Up @@ -503,7 +504,7 @@ public void testPreparedStatementExecuteUpdateReturnGeneratedKeys() throws SQLEx

@Test
public void testPreparedStatementExecuteUpdateReturnColumnNames() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
assertEquals(1, connection.prepareStatement(dml, new String[] {"id"}).executeUpdate());
assertEquals(0, connection.prepareStatement(DDL, new String[] {"id"}).executeUpdate());
assertEquals(
Expand All @@ -523,7 +524,7 @@ public void testPreparedStatementExecuteUpdateReturnColumnNames() throws SQLExce

@Test
public void testPreparedStatementExecuteUpdateReturnColumnIndexes() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
assertEquals(1, connection.prepareStatement(dml, new int[] {1}).executeUpdate());
assertEquals(0, connection.prepareStatement(DDL, new int[] {1}).executeUpdate());
assertEquals(0, connection.prepareStatement(clientSideUpdate, new int[] {1}).executeUpdate());
Expand All @@ -539,7 +540,7 @@ public void testPreparedStatementExecuteUpdateReturnColumnIndexes() throws SQLEx

@Test
public void testPreparedStatementLargeExecuteUpdate() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
assertEquals(1L, connection.prepareStatement(dml).executeLargeUpdate());
assertEquals(0L, connection.prepareStatement(DDL).executeLargeUpdate());
assertEquals(0L, connection.prepareStatement(clientSideUpdate).executeLargeUpdate());
Expand All @@ -554,7 +555,7 @@ public void testPreparedStatementLargeExecuteUpdate() throws SQLException {

@Test
public void testPreparedStatementExecuteLargeUpdateReturnGeneratedKeys() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
// TODO: Add tests for RETURN_GENERATED_KEYS when that is supported.
assertEquals(
1, connection.prepareStatement(dml, Statement.NO_GENERATED_KEYS).executeLargeUpdate());
Expand Down Expand Up @@ -587,7 +588,7 @@ public void testPreparedStatementExecuteLargeUpdateReturnGeneratedKeys() throws

@Test
public void testPreparedStatementExecuteLargeUpdateReturnColumnNames() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
assertEquals(1, connection.prepareStatement(dml, new String[] {"id"}).executeLargeUpdate());
assertEquals(0, connection.prepareStatement(DDL, new String[] {"id"}).executeLargeUpdate());
assertEquals(
Expand All @@ -612,7 +613,7 @@ public void testPreparedStatementExecuteLargeUpdateReturnColumnNames() throws SQ

@Test
public void testPreparedStatementExecuteLargeUpdateReturnColumnIndexes() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
assertEquals(1, connection.prepareStatement(dml, new int[] {1}).executeLargeUpdate());
assertEquals(0, connection.prepareStatement(DDL, new int[] {1}).executeLargeUpdate());
assertEquals(
Expand All @@ -631,7 +632,7 @@ public void testPreparedStatementExecuteLargeUpdateReturnColumnIndexes() throws

@Test
public void testPreparedStatementExecute() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
verifyPreparedUpdateCount(connection.prepareStatement(dml), PreparedStatement::execute, 1L);
verifyPreparedUpdateCount(
connection.prepareStatement(largeDml), PreparedStatement::execute, LARGE_UPDATE_COUNT);
Expand All @@ -651,7 +652,7 @@ public void testPreparedStatementExecute() throws SQLException {

@Test
public void testPreparedStatementExecuteReturnGeneratedKeys() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
// TODO: Add tests for RETURN_GENERATED_KEYS when that is supported.
verifyPreparedUpdateCount(
connection.prepareStatement(dml, Statement.NO_GENERATED_KEYS),
Expand Down Expand Up @@ -683,7 +684,7 @@ public void testPreparedStatementExecuteReturnGeneratedKeys() throws SQLExceptio

@Test
public void testPreparedStatementExecuteReturnColumnNames() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
verifyPreparedUpdateCount(
connection.prepareStatement(dml, new String[] {"id"}), PreparedStatement::execute, 1L);
verifyPreparedUpdateCount(
Expand Down Expand Up @@ -711,7 +712,7 @@ public void testPreparedStatementExecuteReturnColumnNames() throws SQLException

@Test
public void testPreparedStatementExecuteReturnColumnIndexes() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
verifyPreparedUpdateCount(
connection.prepareStatement(dml, new int[] {1}), PreparedStatement::execute, 1L);
verifyPreparedUpdateCount(
Expand Down
11 changes: 6 additions & 5 deletions src/test/java/com/google/cloud/spanner/jdbc/MultiplexedSessionsMockServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,14 @@ private String createUrl() {
getPort(), "proj", "inst", "db" + (dialect == Dialect.POSTGRESQL ? "pg" : ""));
}

private Connection createConnection() throws SQLException {
@Override
protected Connection createJdbcConnection() throws SQLException {
return DriverManager.getConnection(createUrl());
}

@Test
public void testUsesMultiplexedSessionForQueryInAutoCommit() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
assertTrue(connection.getAutoCommit());
try (ResultSet resultSet = connection.createStatement().executeQuery(SELECT_RANDOM_SQL)) {
//noinspection StatementWithEmptyBody
Expand All @@ -106,7 +107,7 @@ public void testUsesMultiplexedSessionForQueryInAutoCommit() throws SQLException
@Test
public void testUsesMultiplexedSessionForQueryInReadOnlyTransaction() throws SQLException {
int numQueries = 2;
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
connection.setReadOnly(true);
connection.setAutoCommit(false);

Expand Down Expand Up @@ -137,7 +138,7 @@ public void testUsesMultiplexedSessionForQueryInReadOnlyTransaction() throws SQL

@Test
public void testUsesRegularSessionForDmlInAutoCommit() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
assertTrue(connection.getAutoCommit());
assertEquals(1, connection.createStatement().executeUpdate(INSERT_SQL));
}
Expand All @@ -158,7 +159,7 @@ public void testUsesRegularSessionForDmlInAutoCommit() throws SQLException {

@Test
public void testUsesRegularSessionForQueryInTransaction() throws SQLException {
try (Connection connection = createConnection()) {
try (Connection connection = createJdbcConnection()) {
connection.setAutoCommit(false);
assertFalse(connection.getAutoCommit());

Expand Down
Loading
Loading