Skip to content

Commit 92c1190

Browse files
Neenu1995Neenu1995
authored
chore(bigquery-jdbc): clean up old type coercion files (#14231)
1 parent 590a51c commit 92c1190

19 files changed

Lines changed: 399 additions & 2336 deletions

‎java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryBaseResultSet.java‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import java.sql.Statement;
4949
import java.sql.Time;
5050
import java.sql.Timestamp;
51+
import java.time.ZoneId;
5152
import java.util.Calendar;
5253
import java.util.List;
5354

@@ -551,22 +552,40 @@ public InputStream getBinaryStream(int columnIndex) throws SQLException {
551552
@Override
552553
public Date getDate(int columnIndex, Calendar cal) throws SQLException {
553554
LOG.finestTrace("getDate");
554-
Date date = getDate(columnIndex);
555-
return BigQueryTypeCoercionUtility.convertDateWithCalendar(date, cal);
555+
try {
556+
Object value = getObject(columnIndex);
557+
StandardSQLTypeName bqType = getStandardSQLTypeName(columnIndex);
558+
ZoneId zone = (cal == null) ? null : cal.getTimeZone().toZoneId();
559+
return BigQueryTypeRegistry.convert(value, bqType, Date.class, zone);
560+
} catch (BigQueryJdbcException e) {
561+
throw createCoercionException(columnIndex, Date.class, e);
562+
}
556563
}
557564

558565
@Override
559566
public Time getTime(int columnIndex, Calendar cal) throws SQLException {
560567
LOG.finestTrace("getTime");
561-
Time time = getTime(columnIndex);
562-
return BigQueryTypeCoercionUtility.convertTimeWithCalendar(time, cal);
568+
try {
569+
Object value = getObject(columnIndex);
570+
StandardSQLTypeName bqType = getStandardSQLTypeName(columnIndex);
571+
ZoneId zone = (cal == null) ? null : cal.getTimeZone().toZoneId();
572+
return BigQueryTypeRegistry.convert(value, bqType, Time.class, zone);
573+
} catch (BigQueryJdbcException e) {
574+
throw createCoercionException(columnIndex, Time.class, e);
575+
}
563576
}
564577

565578
@Override
566579
public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException {
567580
LOG.finestTrace("getTimestamp");
568-
Timestamp timestamp = getTimestamp(columnIndex);
569-
return BigQueryTypeCoercionUtility.convertTimestampWithCalendar(timestamp, cal);
581+
try {
582+
Object value = getObject(columnIndex);
583+
StandardSQLTypeName bqType = getStandardSQLTypeName(columnIndex);
584+
ZoneId zone = (cal == null) ? null : cal.getTimeZone().toZoneId();
585+
return BigQueryTypeRegistry.convert(value, bqType, Timestamp.class, zone);
586+
} catch (BigQueryJdbcException e) {
587+
throw createCoercionException(columnIndex, Timestamp.class, e);
588+
}
570589
}
571590

572591
@Override

‎java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryCallableStatement.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,13 @@ public Date getDate(String parameterName) throws SQLException {
180180
@Override
181181
public Date getDate(int parameterIndex, Calendar calendar) throws SQLException {
182182
Date date = getDate(parameterIndex);
183-
return BigQueryTypeCoercionUtility.convertDateWithCalendar(date, calendar);
183+
return BigQueryTemporalUtility.convertDateWithCalendar(date, calendar);
184184
}
185185

186186
@Override
187187
public Date getDate(String parameterName, Calendar calendar) throws SQLException {
188188
Date date = getDate(parameterName);
189-
return BigQueryTypeCoercionUtility.convertDateWithCalendar(date, calendar);
189+
return BigQueryTemporalUtility.convertDateWithCalendar(date, calendar);
190190
}
191191

192192
@Override
@@ -459,13 +459,13 @@ public Time getTime(String parameterName) throws SQLException {
459459
@Override
460460
public Time getTime(int parameterIndex, Calendar calendar) throws SQLException {
461461
Time time = getTime(parameterIndex);
462-
return BigQueryTypeCoercionUtility.convertTimeWithCalendar(time, calendar);
462+
return BigQueryTemporalUtility.convertTimeWithCalendar(time, calendar);
463463
}
464464

465465
@Override
466466
public Time getTime(String parameterName, Calendar calendar) throws SQLException {
467467
Time time = getTime(parameterName);
468-
return BigQueryTypeCoercionUtility.convertTimeWithCalendar(time, calendar);
468+
return BigQueryTemporalUtility.convertTimeWithCalendar(time, calendar);
469469
}
470470

471471
@Override
@@ -481,13 +481,13 @@ public Timestamp getTimestamp(String parameterName) throws SQLException {
481481
@Override
482482
public Timestamp getTimestamp(int parameterIndex, Calendar calendar) throws SQLException {
483483
Timestamp ts = getTimestamp(parameterIndex);
484-
return BigQueryTypeCoercionUtility.convertTimestampWithCalendar(ts, calendar);
484+
return BigQueryTemporalUtility.convertTimestampWithCalendar(ts, calendar);
485485
}
486486

487487
@Override
488488
public Timestamp getTimestamp(String parameterName, Calendar calendar) throws SQLException {
489489
Timestamp ts = getTimestamp(parameterName);
490-
return BigQueryTypeCoercionUtility.convertTimestampWithCalendar(ts, calendar);
490+
return BigQueryTemporalUtility.convertTimestampWithCalendar(ts, calendar);
491491
}
492492

493493
@Override
@@ -708,7 +708,7 @@ public void setDate(String parameterName, Date value, Calendar calendar) throws
708708
checkClosed();
709709
this.parameterHandler.setParameter(
710710
parameterName,
711-
BigQueryTypeCoercionUtility.convertDateToCalendar(value, calendar),
711+
BigQueryTemporalUtility.convertDateToCalendar(value, calendar),
712712
Date.class,
713713
BigQueryStatementParameterType.IN,
714714
0);
@@ -860,7 +860,7 @@ public void setTime(String parameterName, Time value, Calendar calendar) throws
860860
checkClosed();
861861
this.parameterHandler.setParameter(
862862
parameterName,
863-
value == null ? null : BigQueryTypeCoercionUtility.convertTimeWithCalendar(value, calendar),
863+
value == null ? null : BigQueryTemporalUtility.convertTimeWithCalendar(value, calendar),
864864
Time.class,
865865
BigQueryStatementParameterType.IN,
866866
0);
@@ -879,7 +879,7 @@ public void setTimestamp(String parameterName, Timestamp value, Calendar calenda
879879
checkClosed();
880880
this.parameterHandler.setParameter(
881881
parameterName,
882-
BigQueryTypeCoercionUtility.convertTimestampWithCalendar(value, calendar),
882+
BigQueryTemporalUtility.convertTimestampWithCalendar(value, calendar),
883883
Timestamp.class,
884884
BigQueryStatementParameterType.IN,
885885
0);

‎java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryCoercion.java‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryDefaultCoercions.java‎

Lines changed: 0 additions & 102 deletions
This file was deleted.

0 commit comments

Comments
 (0)