Skip to content

fix(bigquery-jdbc): preserve Timestamp instant in PreparedStatement and CallableStatement Calendar overloads #14640

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
keshavdandeva merged 4 commits into from
Oct 13, 2026
Merged

fix(bigquery-jdbc): preserve Timestamp instant in PreparedStatement and CallableStatement Calendar overloads #14640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ffaa7f
fix(bigquery-jdbc): preserve `Timestamp` instant in `PreparedStatemen…
keshavdandeva Oct 12, 2026
11cc079
Merge branch 'main' into jdbc/timestamp-bug-1
keshavdandeva Oct 12, 2026
64e2458
update unit tests
keshavdandeva Oct 12, 2026
42299f0
address pr feedback
keshavdandeva Oct 13, 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
13 changes: 3 additions & 10 deletions ...bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryCallableStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,14 +480,12 @@ public Timestamp getTimestamp(String parameterName) throws SQLException {

@Override
public Timestamp getTimestamp(int parameterIndex, Calendar calendar) throws SQLException {
Timestamp ts = getTimestamp(parameterIndex);
return BigQueryTemporalUtility.convertTimestampWithCalendar(ts, calendar);
return getTimestamp(parameterIndex);
}

@Override
public Timestamp getTimestamp(String parameterName, Calendar calendar) throws SQLException {
Timestamp ts = getTimestamp(parameterName);
return BigQueryTemporalUtility.convertTimestampWithCalendar(ts, calendar);
return getTimestamp(parameterName);
}
Comment thread
keshavdandeva marked this conversation as resolved.

@Override
Expand Down Expand Up @@ -877,12 +875,7 @@ public void setTimestamp(String parameterName, Timestamp value) throws SQLExcept
public void setTimestamp(String parameterName, Timestamp value, Calendar calendar)
throws SQLException {
checkClosed();
this.parameterHandler.setParameter(
parameterName,
BigQueryTemporalUtility.convertTimestampWithCalendar(value, calendar),
Timestamp.class,
BigQueryStatementParameterType.IN,
0);
setTimestamp(parameterName, value);
}

@Override
Expand Down
3 changes: 1 addition & 2 deletions ...bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryPreparedStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,8 +644,7 @@ public void setTime(int parameterIndex, Time value, Calendar calendar) throws SQ
public void setTimestamp(int parameterIndex, Timestamp value, Calendar calendar)
throws SQLException {
checkClosed();
setTimestamp(
parameterIndex, BigQueryTemporalUtility.convertTimestampWithCalendar(value, calendar));
setTimestamp(parameterIndex, value);
}

@Override
Expand Down
20 changes: 0 additions & 20 deletions java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryTemporalUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,24 +478,4 @@ static Time convertTimeWithCalendar(Time time, Calendar cal) {
targetCal.set(Calendar.MILLISECOND, defaultCal.get(Calendar.MILLISECOND));
return new Time(targetCal.getTimeInMillis());
}

/**
* Converts a java.sql.Timestamp by shifting its wall-clock fields into the target Calendar's
* timezone per JDBC specification while preserving nanosecond precision.
*/
static Timestamp convertTimestampWithCalendar(Timestamp timestamp, Calendar cal) {
if (timestamp == null || cal == null) {
return timestamp;
}
ZoneId systemZone = ZoneId.systemDefault();
ZoneId targetZone = cal.getTimeZone().toZoneId();
if (systemZone.equals(targetZone)) {
return timestamp;
}
LocalDateTime ldt = timestamp.toLocalDateTime();
ZonedDateTime zdt = ldt.atZone(targetZone);
Timestamp adjustedTimestamp = Timestamp.from(zdt.toInstant());
adjustedTimestamp.setNanos(timestamp.getNanos());
return adjustedTimestamp;
}
}
35 changes: 21 additions & 14 deletions ...uery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryCallableStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@
import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
import java.util.TimeZone;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

public class BigQueryCallableStatementTest {

Expand Down Expand Up @@ -820,26 +823,28 @@ public void testGetTimestampParamByName() throws SQLException {
assertEquals(expected, actual);
}

@Test
public void testGetTimestampParamWithCalByIndex() throws SQLException {
@ParameterizedTest
@ValueSource(strings = {"America/New_York", "Asia/Tokyo"})
public void testGetTimestampParamWithCalByIndex(String zoneId) throws SQLException {
BigQueryCallableStatement statement =
new BigQueryCallableStatement(bigQueryConnection, "call testProc('?')");
assertNotNull(statement);
Calendar cal = Calendar.getInstance();
Timestamp expected = new Timestamp(cal.getTimeInMillis());
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone(zoneId));
Timestamp expected = new Timestamp(1700000000000L);

statement.getParameterHandler().setParameter(1, expected, Timestamp.class);
Timestamp actual = statement.getTimestamp(1, cal);
assertEquals(expected, actual);
}

@Test
public void testGetTimestampParamWithCalByName() throws SQLException {
@ParameterizedTest
@ValueSource(strings = {"America/New_York", "Asia/Tokyo"})
public void testGetTimestampParamWithCalByName(String zoneId) throws SQLException {
BigQueryCallableStatement statement =
new BigQueryCallableStatement(bigQueryConnection, "call testProc('?')");
assertNotNull(statement);
Calendar cal = Calendar.getInstance();
Timestamp expected = new Timestamp(cal.getTimeInMillis());
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone(zoneId));
Timestamp expected = new Timestamp(1700000000000L);

statement
.getParameterHandler()
Expand Down Expand Up @@ -1050,22 +1055,24 @@ public void testSetTimestampParamByName() throws SQLException {
assertEquals(expected, actual);
}

@Test
public void testSetTimestampCalParamByName() throws SQLException {
@ParameterizedTest
@ValueSource(strings = {"America/New_York", "Asia/Tokyo"})
public void testSetTimestampCalParamByName(String zoneId) throws SQLException {
BigQueryCallableStatement statement =
new BigQueryCallableStatement(bigQueryConnection, "call testProc('?')");
assertNotNull(statement);
Timestamp expectedTimestamp = Timestamp.valueOf("2026-07-17 12:34:56.789");
Calendar expectedCal = Calendar.getInstance();
Timestamp expectedTimestamp = new Timestamp(1700000000000L);
Calendar expectedCal = Calendar.getInstance(TimeZone.getTimeZone(zoneId));

statement.setTimestamp(PARAM_KEY, expectedTimestamp, expectedCal);
Timestamp actual = statement.getTimestamp(PARAM_KEY);
assertNotNull(actual);
assertEquals(expectedTimestamp, actual);
actual = statement.getTimestamp(PARAM_KEY, expectedCal);
assertNotNull(actual);
assertEquals(expectedTimestamp, actual);
}

////////// Private helper methods ////////////////////////

private void registerOutParamIndexHelper(
int paramIndex, int javaSqlType, Class<?> javaType, StandardSQLTypeName sqlType, int scale)
throws SQLException {
Expand Down
10 changes: 7 additions & 3 deletions ...bc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryPreparedStatementSettersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
import java.util.TimeZone;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

public class BigQueryPreparedStatementSettersTest {

Expand Down Expand Up @@ -234,15 +236,17 @@ public void testSetTimeWithCalendar() throws Exception {
assertEquals(originalMillis, cal.getTimeInMillis());
}

@Test
public void testSetTimestampWithCalendar() throws Exception {
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
@ParameterizedTest
@ValueSource(strings = {"America/New_York", "Asia/Tokyo"})
public void testSetTimestampWithCalendar(String zoneId) throws Exception {
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone(zoneId));
cal.setTimeInMillis(1000000L);
long originalMillis = cal.getTimeInMillis();
Timestamp ts = new Timestamp(1700000000000L);

preparedStatement.setTimestamp(1, ts, cal);
assertEquals(Timestamp.class, preparedStatement.parameterHandler.getType(1));
assertEquals(ts, preparedStatement.parameterHandler.getParameter(1));
assertEquals(originalMillis, cal.getTimeInMillis());
}

Expand Down
25 changes: 0 additions & 25 deletions ...gquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryTemporalUtilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,31 +148,6 @@ public void testConvertTimeWithCalendar() {
assertThat(resultCal.get(Calendar.SECOND)).isEqualTo(45);
}

@Test
public void testConvertTimestampWithCalendar() {
Timestamp ts = Timestamp.valueOf("2026-08-24 15:30:45.123456789");
Calendar cal = Calendar.getInstance();

// Null checks
assertThat(BigQueryTemporalUtility.convertTimestampWithCalendar(null, cal)).isNull();
assertThat(BigQueryTemporalUtility.convertTimestampWithCalendar(ts, null)).isSameInstanceAs(ts);

// Same timezone fast-path
Calendar sameZoneCal = Calendar.getInstance(TimeZone.getDefault());
assertThat(BigQueryTemporalUtility.convertTimestampWithCalendar(ts, sameZoneCal))
.isSameInstanceAs(ts);

// Different timezone preserves wall-clock shift and nanoseconds
Calendar tokyoCal = Calendar.getInstance(TimeZone.getTimeZone("Asia/Tokyo"));
Timestamp result = BigQueryTemporalUtility.convertTimestampWithCalendar(ts, tokyoCal);
Instant expectedInstant =
LocalDateTime.of(2026, 8, 24, 15, 30, 45, 123456789)
.atZone(ZoneId.of("Asia/Tokyo"))
.toInstant();
assertThat(result.getTime()).isEqualTo(expectedInstant.toEpochMilli());
assertThat(result.getNanos()).isEqualTo(123456789);
}

@Test
public void testBoxDateTimeAndDate() {
Timestamp ts =
Expand Down
11 changes: 0 additions & 11 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 @@ -444,17 +444,6 @@ public void testSetterGetterTimestamp() throws SQLException {
assertEquals(expected, actual);
}

@Test
public void testSetterGetterTimestampCal() throws SQLException {
CallableStatement callableStatement = this.bigQueryConnection.prepareCall("call testProc('?')");
assertNotNull(callableStatement);
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);
}

// Block B Tests
@Test
public void testCallableStatementScriptExecuteUpdate() throws SQLException {
Expand Down
Loading