Skip to content

test(bigquery-jdbc): reference ITs for timestamp time zone handling #14515

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

Open
keshavdandeva wants to merge 3 commits into
base: main
Choose a base branch
from
+801 −48
Open

test(bigquery-jdbc): reference ITs for timestamp time zone handling #14515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a95bb7a
test(bigquery-jdbc): reference ITs for timestamp time zone handling
keshavdandeva Sep 25, 2026
6952767
Merge branch 'main' into jdbc/timestamp-it
keshavdandeva Sep 25, 2026
f89f10b
Merge branch 'main' into jdbc/timestamp-it
Neenu1995 Oct 8, 2026
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
74 changes: 59 additions & 15 deletions java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.google.cloud.bigquery.jdbc.it;

import static com.google.common.truth.Truth.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand Down Expand Up @@ -57,6 +58,7 @@
import java.time.Instant;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.Calendar;
import java.util.Properties;
Expand Down Expand Up @@ -1741,12 +1743,16 @@ public void testPreparedStatementDateTimeValues() throws SQLException {

bigQueryStatement.execute(String.format(createTableQuery, DATASET, TABLE_NAME1));

Instant moment = Instant.parse("2025-12-03T12:34:56.123Z");
Time noon = Time.valueOf(LocalTime.NOON);
Date date = Date.valueOf("2025-12-03");

PreparedStatement insertPs = bigQueryConnection.prepareStatement(insertQuery);
insertPs.setString(1, "dishwasher");
insertPs.setInt(2, 1);
insertPs.setTimestamp(3, new Timestamp(System.currentTimeMillis()));
insertPs.setTime(4, Time.valueOf(LocalTime.NOON));
insertPs.setDate(5, Date.valueOf("2025-12-3"));
insertPs.setTimestamp(3, Timestamp.from(moment));
insertPs.setTime(4, noon);
insertPs.setDate(5, date);

int insertStatus = insertPs.executeUpdate();
assertEquals(1, insertStatus);
Expand All @@ -1755,22 +1761,65 @@ public void testPreparedStatementDateTimeValues() throws SQLException {
Calendar utcCal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
insertPs.setString(1, "refrigerator");
insertPs.setInt(2, 2);
insertPs.setTimestamp(3, new Timestamp(System.currentTimeMillis()), utcCal);
insertPs.setTime(4, Time.valueOf(LocalTime.NOON), utcCal);
insertPs.setDate(5, Date.valueOf("2025-12-03"), utcCal);
insertPs.setTimestamp(3, Timestamp.from(moment), utcCal);
insertPs.setTime(4, noon, utcCal);
insertPs.setDate(5, date, utcCal);

int insertStatus2 = insertPs.executeUpdate();
assertEquals(1, insertStatus2);

// Read the stored values server-side so no driver temporal conversion is involved.
ResultSet rs =
bigQueryStatement.executeQuery(
String.format("SELECT COUNT(*) AS row_count\n" + "FROM %s.%s", DATASET, TABLE_NAME1));
rs.next();
String.format(
"SELECT IntegerField, UNIX_MILLIS(TimestampField), CAST(TimeField AS STRING),"
+ " CAST(DateField AS STRING) FROM %s.%s ORDER BY IntegerField",
DATASET, TABLE_NAME1));

assertTrue(rs.next());
assertEquals(1, rs.getInt(1));
long plainTimestamp = rs.getLong(2);
String plainTime = rs.getString(3);
String plainDate = rs.getString(4);
assertTrue(rs.next());
assertEquals(2, rs.getInt(1));
long calTimestamp = rs.getLong(2);
String calTime = rs.getString(3);
String calDate = rs.getString(4);
assertFalse(rs.next());

// Drop before asserting so a failure does not leak the table.
String dropQuery = String.format("DROP TABLE %s.%s", DATASET, TABLE_NAME1);
int dropStatus = bigQueryStatement.executeUpdate(dropQuery);
assertEquals(0, dropStatus);

assertAll(
// Row 1: plain setters.
() ->
assertEquals(
moment.toEpochMilli(), plainTimestamp, "setTimestamp must store the moment"),
() -> assertEquals("12:00:00", plainTime, "setTime must send its digits"),
() -> assertEquals("2025-12-03", plainDate, "setDate must send its digits"),
// Row 2: Calendar setters. The Calendar cannot change a TIMESTAMP moment; for TIME and DATE
// it is the zone the value is rendered in.
() ->
assertEquals(
moment.toEpochMilli(), calTimestamp, "setTimestamp(ts, cal) must store the moment"),
() ->
assertEquals(
Instant.ofEpochMilli(noon.getTime())
.atZone(ZoneOffset.UTC)
.format(DateTimeFormatter.ofPattern("HH:mm:ss")),
calTime,
"setTime(t, cal) must send the time of t in the Calendar's zone"),
() ->
assertEquals(
Instant.ofEpochMilli(date.getTime())
.atZone(ZoneOffset.UTC)
.toLocalDate()
.toString(),
calDate,
"setDate(d, cal) must send the date of d in the Calendar's zone"));
}

@Test
Expand Down Expand Up @@ -2646,12 +2695,7 @@ public void validateGetString() throws Exception {
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSS");
String expectedTimestampString =
timestampFormatter.format(
Instant.parse("2023-07-28T12:30:00Z").atZone(ZoneId.systemDefault()).toLocalDateTime());
String expectedArrayTimestamp =
String.format(
"[%s, %s]",
Timestamp.from(Instant.parse("2023-01-01T01:00:00Z")),
Timestamp.from(Instant.parse("2023-01-01T02:00:00Z")));
Instant.parse("2023-07-28T12:30:00Z").atZone(ZoneOffset.UTC).toLocalDateTime());

final ImmutableMap<String, Object> stringResults =
new ImmutableMap.Builder<String, Object>()
Expand Down Expand Up @@ -2679,7 +2723,7 @@ public void validateGetString() throws Exception {
.put("arrayNumeric", "[10.5, 20.5]")
.put("arrayBignumeric", "[100.1, 200.2]")
.put("arrayBoolean", "[true, false]")
.put("arrayTimestamp", expectedArrayTimestamp)
.put("arrayTimestamp", "[2023-01-01 01:00:00.0, 2023-01-01 02:00:00.0]")
.put("arrayDate", "[2023-01-01, 2023-01-02]")
.put("arrayTime", "[01:00:00, 02:00:00]")
.put("arrayDatetime", "[2023-01-01 01:00:00.0, 2023-01-01 02:00:00.0]")
Expand Down
60 changes: 46 additions & 14 deletions ...igquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITCallableStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,13 @@
import java.sql.Time;
import java.sql.Timestamp;
import java.sql.Types;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Calendar;
import java.util.Properties;
import java.util.Random;
import java.util.TimeZone;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
Expand All @@ -61,6 +65,10 @@ public class ITCallableStatementTest extends ITBase {
private static final String CALLABLE_STMT_DML_DELETE_PROC_NAME =
"IT_CALLABLE_STMT_PROC_DML_DELETE_TEST";
private static final String CALLABLE_STMT_DML_TABLE_NAME = "IT_CALLABLE_STMT_PROC_DML_TABLE";
// The Calendar tests pin the JVM zone so the Calendar always differs from it; otherwise the
// driver skips the conversion.
private static final ZoneId CALENDAR_TEST_JVM_ZONE = ZoneId.of("America/New_York");
private static final ZoneId CALENDAR_ZONE = ZoneId.of("Asia/Tokyo");

static Connection bigQueryConnection;
static BigQuery bigQuery;
Expand Down Expand Up @@ -316,11 +324,18 @@ public void testSetterGetterDate() throws SQLException {
public void testSetterGetterDateCal() throws SQLException {
CallableStatement callableStatement = this.bigQueryConnection.prepareCall("call testProc('?')");
assertNotNull(callableStatement);
Date expected = new Date(1L);
Calendar cal = Calendar.getInstance();
callableStatement.setDate(CALLABLE_STMT_PARAM_KEY, expected, cal);
Date actual = callableStatement.getDate(CALLABLE_STMT_PARAM_KEY, cal);
assertEquals(expected, actual);
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone(CALENDAR_ZONE));
Date expected =
new Date(LocalDate.of(2025, 1, 1).atStartOfDay(CALENDAR_ZONE).toInstant().toEpochMilli());
TimeZone originalJvmZone = TimeZone.getDefault();
TimeZone.setDefault(TimeZone.getTimeZone(CALENDAR_TEST_JVM_ZONE));
try {
callableStatement.setDate(CALLABLE_STMT_PARAM_KEY, expected, cal);
Date actual = callableStatement.getDate(CALLABLE_STMT_PARAM_KEY, cal);
assertEquals(expected, actual);
} finally {
TimeZone.setDefault(originalJvmZone);
}
}

@Test
Expand Down Expand Up @@ -427,11 +442,22 @@ public void testSetterGetterTime() throws SQLException {
public void testSetterGetterTimeCal() throws SQLException {
CallableStatement callableStatement = this.bigQueryConnection.prepareCall("call testProc('?')");
assertNotNull(callableStatement);
Time expected = new Time(1L);
Calendar cal = Calendar.getInstance();
callableStatement.setTime(CALLABLE_STMT_PARAM_KEY, expected, cal);
Time actual = callableStatement.getTime(CALLABLE_STMT_PARAM_KEY, cal);
assertEquals(expected, actual);
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone(CALENDAR_ZONE));
Time expected =
new Time(
LocalDateTime.of(1970, 1, 1, 12, 34, 56)
.atZone(CALENDAR_ZONE)
.toInstant()
.toEpochMilli());
Comment thread
keshavdandeva marked this conversation as resolved.
TimeZone originalJvmZone = TimeZone.getDefault();
TimeZone.setDefault(TimeZone.getTimeZone(CALENDAR_TEST_JVM_ZONE));
try {
callableStatement.setTime(CALLABLE_STMT_PARAM_KEY, expected, cal);
Time actual = callableStatement.getTime(CALLABLE_STMT_PARAM_KEY, cal);
assertEquals(expected, actual);
} finally {
TimeZone.setDefault(originalJvmZone);
}
}

@Test
Expand All @@ -448,11 +474,17 @@ public void testSetterGetterTimestamp() throws SQLException {
public void testSetterGetterTimestampCal() throws SQLException {
CallableStatement callableStatement = this.bigQueryConnection.prepareCall("call testProc('?')");
assertNotNull(callableStatement);
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone(CALENDAR_ZONE));
Timestamp expected = new Timestamp(1L);
Calendar cal = Calendar.getInstance();
callableStatement.setTimestamp(CALLABLE_STMT_PARAM_KEY, expected, cal);
Timestamp actual = callableStatement.getTimestamp(CALLABLE_STMT_PARAM_KEY, cal);
assertEquals(expected, actual);
TimeZone originalJvmZone = TimeZone.getDefault();
TimeZone.setDefault(TimeZone.getTimeZone(CALENDAR_TEST_JVM_ZONE));
try {
callableStatement.setTimestamp(CALLABLE_STMT_PARAM_KEY, expected, cal);
Timestamp actual = callableStatement.getTimestamp(CALLABLE_STMT_PARAM_KEY, cal);
assertEquals(expected, actual);
} finally {
TimeZone.setDefault(originalJvmZone);
}
}

// Block B Tests
Expand Down
Loading
Loading