Skip to content

Commit efa3b93

Browse files
committed
Merge branch 'ps-part2a-metadata' into ps-part2b-temporal-setters
2 parents fcb0017 + 5ad02ce commit efa3b93

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcTypeMappings.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,9 @@ static StandardSQLTypeName classToType(Class type)
125125
return StandardSQLTypeName.NUMERIC;
126126
} else if (Date.class.isAssignableFrom(type) || LocalDate.class.isAssignableFrom(type)) {
127127
return StandardSQLTypeName.DATE;
128+
} else if (LocalDateTime.class.isAssignableFrom(type)) {
129+
return StandardSQLTypeName.DATETIME;
128130
} else if (Timestamp.class.isAssignableFrom(type)
129-
|| LocalDateTime.class.isAssignableFrom(type)
130131
|| OffsetDateTime.class.isAssignableFrom(type)
131132
|| Instant.class.isAssignableFrom(type)
132133
|| ZonedDateTime.class.isAssignableFrom(type)) {

java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryParameterMetaData.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,11 @@ public String getParameterClassName(int param) throws SQLException {
120120
return clazz.getName();
121121
}
122122
}
123-
Class<?> boundType = this.parameterHandler.getType(param);
124-
if (boundType != null) {
125-
return boundType.getName();
123+
if (this.parameterHandler != null) {
124+
Class<?> boundType = this.parameterHandler.getType(param);
125+
if (boundType != null) {
126+
return boundType.getName();
127+
}
126128
}
127129
return Object.class.getName();
128130
}

0 commit comments

Comments
 (0)