From 54ea75d2c0d4746f6f472d7ae2ffd48967f1661d Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Tue, 30 Jun 2026 00:52:51 +0000 Subject: [PATCH 1/3] fix(bigquery-jdbc): ensure test uses unique dataset & cleans up --- .../google/cloud/bigquery/jdbc/it/ITBase.java | 4 ++ .../bigquery/jdbc/it/ITBigQueryJDBCTest.java | 39 ++++++++++--------- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBase.java b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBase.java index 0f4cda735e5f..fccedf3710a9 100644 --- a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBase.java +++ b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBase.java @@ -120,6 +120,10 @@ public class ITBase extends BigQueryJdbcBaseTest { + DDL_IT_CALLABLE_STMT_PROC_DML_DELETE_TEST + DDL_IT_CALLABLE_STMT_PROC_TEST; + public static String getUniqueDatasetName(String prefix) { + return prefix + +System.currentTimeMillis() + "_" + (100 + new java.util.Random().nextInt(900)); + } + public static synchronized String getSharedDataset() { if (sharedDataset == null) { sharedDataset = diff --git a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java index a7da13606fe2..c62df7b5d80b 100644 --- a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java +++ b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java @@ -1743,30 +1743,33 @@ public void testValidDestinationTableSavesQueriesWithStandardSQL() throws SQLExc public void testDestinationTableAndDestinationDatasetThatDoesNotExistsCreates() throws SQLException { // setup + String largeResultDataset = ITBase.getUniqueDatasetName("FakeDataset"); String connection_uri = - ITBigQueryJDBCTest.connection_uri - + "QueryDialect=BIG_QUERY;" - + "AllowLargeResults=1;" - + "LargeResultTable=FakeTable;" - + "LargeResultDataset=FakeDataset;"; + String.format( + ITBigQueryJDBCTest.connection_uri + + "QueryDialect=BIG_QUERY;" + + "AllowLargeResults=1;" + + "LargeResultTable=FakeTable;" + + "LargeResultDataset=%s;", + largeResultDataset); String selectLegacyQuery = "SELECT * FROM [bigquery-public-data.deepmind_alphafold.metadata] LIMIT 200;"; Driver driver = BigQueryDriver.getRegisteredDriver(); - Connection connection = driver.connect(connection_uri, new Properties()); - Statement statement = connection.createStatement(); + try (Connection connection = driver.connect(connection_uri, new Properties())) { + Statement statement = connection.createStatement(); - // act - ResultSet resultSet = statement.executeQuery(selectLegacyQuery); + // act + ResultSet resultSet = statement.executeQuery(selectLegacyQuery); - // assertion - assertNotNull(resultSet); - String separateQuery = "SELECT * FROM FakeDataset.FakeTable;"; - boolean result = bigQueryStatement.execute(separateQuery); - assertTrue(result); - - // clean up - bigQueryStatement.execute("DROP SCHEMA FakeDataset CASCADE;"); - connection.close(); + // assertion + assertNotNull(resultSet); + String separateQuery = String.format("SELECT * FROM %s.FakeTable;", largeResultDataset); + boolean result = bigQueryStatement.execute(separateQuery); + assertTrue(result); + } finally { + // clean up + bigQueryStatement.execute(String.format("DROP SCHEMA %s CASCADE;", largeResultDataset)); + } } @Test From 5a495b097e02be808bb3249cb189b358dbcb25a0 Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Tue, 30 Jun 2026 01:03:18 +0000 Subject: [PATCH 2/3] feedback --- .../src/test/java/com/google/cloud/bigquery/jdbc/it/ITBase.java | 2 +- .../com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBase.java b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBase.java index fccedf3710a9..71b81548003a 100644 --- a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBase.java +++ b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBase.java @@ -121,7 +121,7 @@ public class ITBase extends BigQueryJdbcBaseTest { + DDL_IT_CALLABLE_STMT_PROC_TEST; public static String getUniqueDatasetName(String prefix) { - return prefix + +System.currentTimeMillis() + "_" + (100 + new java.util.Random().nextInt(900)); + return prefix + System.currentTimeMillis() + "_" + (100 + new java.util.Random().nextInt(900)); } public static synchronized String getSharedDataset() { diff --git a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java index c62df7b5d80b..320100352080 100644 --- a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java +++ b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java @@ -1768,7 +1768,7 @@ public void testDestinationTableAndDestinationDatasetThatDoesNotExistsCreates() assertTrue(result); } finally { // clean up - bigQueryStatement.execute(String.format("DROP SCHEMA %s CASCADE;", largeResultDataset)); + bigQueryStatement.execute(String.format("DROP SCHEMA IF EXISTS %s CASCADE;", largeResultDataset)); } } From 231e6171edf68f76fe38abd02e29d116a946d9d0 Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Tue, 30 Jun 2026 01:05:22 +0000 Subject: [PATCH 3/3] lint --- .../com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java index 320100352080..21a519f1b84c 100644 --- a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java +++ b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java @@ -1768,7 +1768,8 @@ public void testDestinationTableAndDestinationDatasetThatDoesNotExistsCreates() assertTrue(result); } finally { // clean up - bigQueryStatement.execute(String.format("DROP SCHEMA IF EXISTS %s CASCADE;", largeResultDataset)); + bigQueryStatement.execute( + String.format("DROP SCHEMA IF EXISTS %s CASCADE;", largeResultDataset)); } }