From fd29409496ee9725271a50a02e1eb8006f8c785f Mon Sep 17 00:00:00 2001
From: Kirill Logachev <kirl@google.com>
Date: Tue, 30 Jun 2026 01:00:59 +0000
Subject: [PATCH 1/2] fix(bigquery-jdbc): update format validation tests to
 create tables for the test

---
 .../google/cloud/bigquery/jdbc/it/ITBase.java | 76 ++++++++++++++++++-
 .../bigquery/jdbc/it/ITBigQueryJDBCTest.java  |  7 +-
 2 files changed, 80 insertions(+), 3 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..3b08b634b111 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
@@ -109,6 +109,78 @@ public class ITBase extends BigQueryJdbcBaseTest {
           + "  CONSTRAINT my_fk2 FOREIGN KEY (address) REFERENCES `%1$s.%2$s.JDBC_CONSTRAINTS_TEST_TABLE3`(address) NOT ENFORCED\n"
           + ");\n";
 
+  private static final String DDL_ALL_BQ_TYPES =
+      "CREATE TABLE IF NOT EXISTS `%1$s.%2$s.all_bq_types`\n"
+          + "(\n"
+          + "  stringField STRING,\n"
+          + "  bytesField BYTES,\n"
+          + "  intField INT64,\n"
+          + "  floatField FLOAT64,\n"
+          + "  numericField NUMERIC,\n"
+          + "  bigNumericField BIGNUMERIC,\n"
+          + "  booleanField BOOLEAN,\n"
+          + "  timestampFiled TIMESTAMP,\n"
+          + "  dateField DATE,\n"
+          + "  timeField TIME,\n"
+          + "  dateTimeField DATETIME,\n"
+          + "  geographyField GEOGRAPHY,\n"
+          + "  recordField STRUCT<name STRING, recordNested STRUCT<lastName STRING>>,\n"
+          + "  rangeField RANGE<DATE>,\n"
+          + "  jsonField JSON,\n"
+          + "  arrayString ARRAY<STRING>,\n"
+          + "  arrayRecord ARRAY<STRUCT<value STRING>>,\n"
+          + "  arrayBytes ARRAY<BYTES>,\n"
+          + "  arrayInteger ARRAY<INT64>,\n"
+          + "  arrayNumeric ARRAY<NUMERIC>,\n"
+          + "  arrayBignumeric ARRAY<BIGNUMERIC>,\n"
+          + "  arrayBoolean ARRAY<BOOLEAN>,\n"
+          + "  arrayTimestamp ARRAY<TIMESTAMP>,\n"
+          + "  arrayDate ARRAY<DATE>,\n"
+          + "  arrayTime ARRAY<TIME>,\n"
+          + "  arrayDatetime ARRAY<DATETIME>,\n"
+          + "  arrayGeography ARRAY<GEOGRAPHY>,\n"
+          + "  arrayRange ARRAY<RANGE<DATE>>,\n"
+          + "  arrayJson ARRAY<JSON>,\n"
+          + "  arrayFloat ARRAY<FLOAT64>\n"
+          + ");\n";
+
+  private static final String DML_ALL_BQ_TYPES =
+      "INSERT INTO `%1$s.%2$s.all_bq_types`\n"
+          + "(\n"
+          + "  stringField, bytesField, intField, floatField, numericField, bigNumericField, booleanField,\n"
+          + "  timestampFiled, dateField, timeField, dateTimeField, geographyField, recordField, rangeField, jsonField,\n"
+          + "  arrayString, arrayRecord, arrayBytes, arrayInteger, arrayNumeric, arrayBignumeric, arrayBoolean,\n"
+          + "  arrayTimestamp, arrayDate, arrayTime, arrayDatetime, arrayGeography, arrayRange, arrayJson, arrayFloat\n"
+          + ")\n"
+          + "VALUES\n"
+          + "(\n"
+          + "  'StringValue', CAST('BytesValue' AS BYTES), 123, 10.5, CAST('12345.67' AS NUMERIC), CAST('98765432109876543210.123456789' AS BIGNUMERIC), true,\n"
+          + "  TIMESTAMP '2023-07-28 12:30:00', DATE '2023-07-28', TIME '12:30:00', DATETIME '2023-07-28 12:30:00', ST_GEOGFROMTEXT('POINT(-74.006 40.7128)'),\n"
+          + "  STRUCT('NameValue' AS name, STRUCT('LastNameValue' AS lastName) AS recordNested),\n"
+          + "  RANGE<DATE> '[2023-01-01, 2023-12-01)', JSON '{\"key\":\"value\"}',\n"
+          + "  ['abc', 'def', 'ghi'],\n"
+          + "  [STRUCT('rec_val1' AS value), STRUCT('rec_val2' AS value)],\n"
+          + "  [CAST('byte1' AS BYTES), CAST('byte2' AS BYTES)],\n"
+          + "  [10, 20],\n"
+          + "  [CAST('10.5' AS NUMERIC), CAST('20.5' AS NUMERIC)],\n"
+          + "  [CAST('100.1' AS BIGNUMERIC), CAST('200.2' AS BIGNUMERIC)],\n"
+          + "  [true, false],\n"
+          + "  [TIMESTAMP '2023-01-01 01:00:00', TIMESTAMP '2023-01-01 02:00:00'],\n"
+          + "  [DATE '2023-01-01', DATE '2023-01-02'],\n"
+          + "  [TIME '01:00:00', TIME '02:00:00'],\n"
+          + "  [DATETIME '2023-01-01 01:00:00', DATETIME '2023-01-01 02:00:00'],\n"
+          + "  [ST_GEOGFROMTEXT('POINT(1 1)'), ST_GEOGFROMTEXT('POINT(2 2)')],\n"
+          + "  [RANGE<DATE> '[2023-01-01, 2023-01-03)', RANGE<DATE> '[2023-01-04, 2023-01-06)'],\n"
+          + "  [JSON '{\"a\":1}', JSON '{\"b\":2}'],\n"
+          + "  [1.1, 2.2]\n"
+          + "),\n"
+          + "(\n"
+          + "  NULL, NULL, NULL, NULL, NULL, NULL, NULL,\n"
+          + "  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,\n"
+          + "  [], [], [], [], [], [], [],\n"
+          + "  [], [], [], [], [], [], [], []\n"
+          + ");\n";
+
   private static final String CREATE_RESOURCES_SCRIPT =
       DDL_IT_CALLABLE_STMT_PROC_DML_TABLE
           + DDL_IT_CALLABLE_STMT_PROC_TABLE
@@ -118,7 +190,9 @@ public class ITBase extends BigQueryJdbcBaseTest {
           + DDL_IT_CALLABLE_STMT_PROC_DML_INSERT_TEST
           + DDL_IT_CALLABLE_STMT_PROC_DML_UPDATE_TEST
           + DDL_IT_CALLABLE_STMT_PROC_DML_DELETE_TEST
-          + DDL_IT_CALLABLE_STMT_PROC_TEST;
+          + DDL_IT_CALLABLE_STMT_PROC_TEST
+          + DDL_ALL_BQ_TYPES
+          + DML_ALL_BQ_TYPES;
 
   public static synchronized String getSharedDataset() {
     if (sharedDataset == null) {
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..e345270df6e4 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
@@ -2419,7 +2419,9 @@ private void validate(
         Statement statementHTAPI = connectionHTAPI.createStatement()) {
 
       String query =
-          "SELECT * FROM INTEGRATION_TEST_FORMAT.all_bq_types WHERE stringField is not null";
+          String.format(
+              "SELECT * FROM `%s.%s.all_bq_types` WHERE stringField is not null",
+              PROJECT_ID, DATASET);
       ResultSet resultSetRegular = statement.executeQuery(query);
       ResultSet resultSetArrow = statementHTAPI.executeQuery(query);
       resultSetRegular.next();
@@ -2710,7 +2712,8 @@ public void validateGetObjectNullValues() throws Exception {
         Statement statementHTAPI = connectionHTAPI.createStatement()) {
 
       String query =
-          "SELECT * FROM INTEGRATION_TEST_FORMAT.all_bq_types WHERE stringField is null;";
+          String.format(
+              "SELECT * FROM `%s.%s.all_bq_types` WHERE stringField is null;", PROJECT_ID, DATASET);
       ResultSet resultSetRegular = statement.executeQuery(query);
       ResultSet resultSetArrow = statementHTAPI.executeQuery(query);
       resultSetRegular.next();

From 49a71b46c92afc1b1d1d2585ef349c7aeec4f639 Mon Sep 17 00:00:00 2001
From: Kirill Logachev <kirl@google.com>
Date: Tue, 30 Jun 2026 01:08:16 +0000
Subject: [PATCH 2/2] feedback

---
 .../src/test/java/com/google/cloud/bigquery/jdbc/it/ITBase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 3b08b634b111..361b92894fee 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
@@ -110,7 +110,7 @@ public class ITBase extends BigQueryJdbcBaseTest {
           + ");\n";
 
   private static final String DDL_ALL_BQ_TYPES =
-      "CREATE TABLE IF NOT EXISTS `%1$s.%2$s.all_bq_types`\n"
+      "CREATE OR REPLACE TABLE `%1$s.%2$s.all_bq_types`\n"
           + "(\n"
           + "  stringField STRING,\n"
           + "  bytesField BYTES,\n"