googleapis · Neenu1995 · Jun 2, 2026 · Jun 1, 2026 · Jun 1, 2026 · Jun 1, 2026
@@ -42,7 +42,7 @@
 import com.google.cloud.bigquery.TableDefinition;
 import com.google.cloud.bigquery.TableId;
 import com.google.cloud.bigquery.exception.BigQueryJdbcException;
-import com.google.common.collect.ImmutableMap;
+import com.google.cloud.bigquery.jdbc.BigQueryJdbcTypeMappings.ColumnTypeInfo;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -60,7 +60,6 @@
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Properties;
 import java.util.Scanner;
 import java.util.Set;
@@ -2436,27 +2435,6 @@ List<FieldValue> createColumnRow(
     return values;
   }
 
-  static class ColumnTypeInfo {
-    final int jdbcType;
-    final String typeName;
-    final Integer columnSize;
-    final Integer decimalDigits;
-    final Integer numPrecRadix;
-
-    ColumnTypeInfo(
-        int jdbcType,
-        String typeName,
-        Integer columnSize,
-        Integer decimalDigits,
-        Integer numPrecRadix) {
-      this.jdbcType = jdbcType;
-      this.typeName = typeName;
-      this.columnSize = columnSize;
-      this.decimalDigits = decimalDigits;
-      this.numPrecRadix = numPrecRadix;
-    }
-  }
-
   ColumnTypeInfo mapBigQueryTypeToJdbc(Field field) {
     Mode mode = (field.getMode() == null) ? Mode.NULLABLE : field.getMode();
     if (mode == Mode.REPEATED) {
@@ -4833,53 +4811,12 @@ private Tuple<String, String> determineEffectiveCatalogAndSchema(
     return Tuple.of(effectiveCatalog, effectiveSchemaPattern);
   }
 
-  // BigQuery STRING represents Unicode character strings (UTF-8).
-  // Standard JDBC maps UTF-8/Unicode data to Types.NVARCHAR rather than Types.VARCHAR.
-  private static final Map<StandardSQLTypeName, ColumnTypeInfo> STANDARD_TYPE_INFO =
-      ImmutableMap.<StandardSQLTypeName, ColumnTypeInfo>builder()
-          .put(StandardSQLTypeName.INT64, new ColumnTypeInfo(Types.BIGINT, "INT64", 19, 0, 10))
-          .put(StandardSQLTypeName.BOOL, new ColumnTypeInfo(Types.BOOLEAN, "BOOL", 1, null, null))
-          .put(
-              StandardSQLTypeName.FLOAT64,
-              new ColumnTypeInfo(Types.DOUBLE, "FLOAT64", 15, null, 10))
-          .put(StandardSQLTypeName.NUMERIC, new ColumnTypeInfo(Types.NUMERIC, "NUMERIC", 38, 9, 10))
-          .put(
-              StandardSQLTypeName.BIGNUMERIC,
-              new ColumnTypeInfo(Types.NUMERIC, "BIGNUMERIC", 77, 38, 10))
-          .put(
-              StandardSQLTypeName.STRING,
-              new ColumnTypeInfo(Types.NVARCHAR, "STRING", null, null, null))
-          .put(
-              StandardSQLTypeName.TIMESTAMP,
-              new ColumnTypeInfo(Types.TIMESTAMP, "TIMESTAMP", 29, null, null))
-          .put(
-              StandardSQLTypeName.DATETIME,
-              new ColumnTypeInfo(Types.TIMESTAMP, "DATETIME", 29, null, null))
-          .put(StandardSQLTypeName.DATE, new ColumnTypeInfo(Types.DATE, "DATE", 10, null, null))
-          .put(StandardSQLTypeName.TIME, new ColumnTypeInfo(Types.TIME, "TIME", 15, null, null))
-          .put(
-              StandardSQLTypeName.GEOGRAPHY,
-              new ColumnTypeInfo(Types.OTHER, "GEOGRAPHY", null, null, null))
-          .put(StandardSQLTypeName.JSON, new ColumnTypeInfo(Types.OTHER, "JSON", null, null, null))
-          .put(
-              StandardSQLTypeName.INTERVAL,
-              new ColumnTypeInfo(Types.OTHER, "INTERVAL", null, null, null))
-          .put(
-              StandardSQLTypeName.RANGE, new ColumnTypeInfo(Types.OTHER, "RANGE", null, null, null))
-          .put(
-              StandardSQLTypeName.BYTES,
-              new ColumnTypeInfo(Types.VARBINARY, "BYTES", null, null, null))
-          .put(
-              StandardSQLTypeName.STRUCT,
-              new ColumnTypeInfo(Types.STRUCT, "STRUCT", null, null, null))
-          .build();
-
   private ColumnTypeInfo getColumnTypeInfoForSqlType(StandardSQLTypeName bqType) {
     if (bqType == null) {
       LOG.warning("Null BigQuery type encountered. Mapping to STRING.");
       return new ColumnTypeInfo(Types.NVARCHAR, "STRING", null, null, null);
     }
-    ColumnTypeInfo info = STANDARD_TYPE_INFO.get(bqType);
+    ColumnTypeInfo info = BigQueryJdbcTypeMappings.STANDARD_TYPE_INFO.get(bqType);
     if (info == null) {
       LOG.warning("Unknown BigQuery type encountered: " + bqType.name() + ". Mapping to STRING.");
       return new ColumnTypeInfo(Types.NVARCHAR, "STRING", null, null, null);

@@ -158,4 +158,64 @@ static Class<?> getJavaType(int javaSQLType) throws BigQueryJdbcSqlFeatureNotSup
   private static <K, V> SimpleEntry<K, V> entry(K key, V value) {
     return new SimpleEntry<>(key, value);
   }
+
+  static class ColumnTypeInfo {
+    final int jdbcType;
+    final String typeName;
+    final Integer columnSize;
+    final Integer decimalDigits;
+    final Integer numPrecRadix;
+
+    ColumnTypeInfo(
+        int jdbcType,
+        String typeName,
+        Integer columnSize,
+        Integer decimalDigits,
+        Integer numPrecRadix) {
+      this.jdbcType = jdbcType;
+      this.typeName = typeName;
+      this.columnSize = columnSize;
+      this.decimalDigits = decimalDigits;
+      this.numPrecRadix = numPrecRadix;
+    }
+  }
+
+  static final Map<StandardSQLTypeName, ColumnTypeInfo> STANDARD_TYPE_INFO =
+      ImmutableMap.<StandardSQLTypeName, ColumnTypeInfo>builder()
+          .put(StandardSQLTypeName.INT64, new ColumnTypeInfo(Types.BIGINT, "INT64", 19, 0, 10))
+          .put(StandardSQLTypeName.BOOL, new ColumnTypeInfo(Types.BOOLEAN, "BOOL", 1, null, null))
+          .put(
+              StandardSQLTypeName.FLOAT64,
+              new ColumnTypeInfo(Types.DOUBLE, "FLOAT64", 15, null, 10))
+          .put(StandardSQLTypeName.NUMERIC, new ColumnTypeInfo(Types.NUMERIC, "NUMERIC", 38, 9, 10))
+          .put(
+              StandardSQLTypeName.BIGNUMERIC,
+              new ColumnTypeInfo(Types.NUMERIC, "BIGNUMERIC", 77, 38, 10))
+          .put(
+              StandardSQLTypeName.STRING,
+              new ColumnTypeInfo(Types.NVARCHAR, "STRING", null, null, null))
+          .put(
+              StandardSQLTypeName.TIMESTAMP,
+              new ColumnTypeInfo(Types.TIMESTAMP, "TIMESTAMP", 26, 6, null))
+          .put(
+              StandardSQLTypeName.DATETIME,
+              new ColumnTypeInfo(Types.TIMESTAMP, "DATETIME", 26, 6, null))
+          .put(StandardSQLTypeName.DATE, new ColumnTypeInfo(Types.DATE, "DATE", 10, 0, null))
+          .put(StandardSQLTypeName.TIME, new ColumnTypeInfo(Types.TIME, "TIME", 15, 6, null))
+          .put(
+              StandardSQLTypeName.GEOGRAPHY,
+              new ColumnTypeInfo(Types.OTHER, "GEOGRAPHY", null, null, null))
+          .put(StandardSQLTypeName.JSON, new ColumnTypeInfo(Types.OTHER, "JSON", null, null, null))
+          .put(
+              StandardSQLTypeName.INTERVAL,
+              new ColumnTypeInfo(Types.OTHER, "INTERVAL", null, null, null))
+          .put(
+              StandardSQLTypeName.RANGE, new ColumnTypeInfo(Types.OTHER, "RANGE", null, null, null))
+          .put(
+              StandardSQLTypeName.BYTES,
+              new ColumnTypeInfo(Types.VARBINARY, "BYTES", null, null, null))
+          .put(
+              StandardSQLTypeName.STRUCT,
+              new ColumnTypeInfo(Types.STRUCT, "STRUCT", null, null, null))
+          .build();
 }
@@ -134,12 +134,32 @@ public String getColumnName(int column) {
 
   @Override
   public int getPrecision(int column) {
-    return (int) (getField(column).getPrecision() != null ? getField(column).getPrecision() : 0);
+    Long precision = getField(column).getPrecision();
+    if (precision != null) {
+      return precision.intValue();
+    }
+    StandardSQLTypeName type = getStandardSQLTypeName(column);
+    BigQueryJdbcTypeMappings.ColumnTypeInfo typeInfo =
+        BigQueryJdbcTypeMappings.STANDARD_TYPE_INFO.get(type);
+    if (typeInfo != null && typeInfo.columnSize != null) {
+      return typeInfo.columnSize;
+    }
+    return 0;
   }
 
   @Override
   public int getScale(int column) {
-    return (int) (getField(column).getScale() != null ? getField(column).getScale() : 0);
+    Long scale = getField(column).getScale();
+    if (scale != null) {
+      return scale.intValue();
+    }
+    StandardSQLTypeName type = getStandardSQLTypeName(column);
+    BigQueryJdbcTypeMappings.ColumnTypeInfo typeInfo =
+        BigQueryJdbcTypeMappings.STANDARD_TYPE_INFO.get(type);
+    if (typeInfo != null && typeInfo.decimalDigits != null) {
+      return typeInfo.decimalDigits;
+    }
+    return 0;
   }
 
   @Override