SNOW-1203558 Fix geo types values (#1663)

snowflakedb · Mar 12, 2024 · 5bb09bf · 5bb09bf
1 parent 730fbbf
commit 5bb09bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeUtil.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeUtil.java
@@ -277,8 +277,12 @@ static ColumnTypeInfo getSnowflakeType(
         break;
 
       case OBJECT:
+        int targetType =
+            "GEOGRAPHY".equals(extColTypeName) || "GEOMETRY".equals(extColTypeName)
+                ? Types.VARCHAR
+                : Types.STRUCT;
         columnTypeInfo =
-            new ColumnTypeInfo(Types.STRUCT, defaultIfNull(extColTypeName, "OBJECT"), baseType);
+            new ColumnTypeInfo(targetType, defaultIfNull(extColTypeName, "OBJECT"), baseType);
         break;
 
       case VARIANT:

diff --git a/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverLatestIT.java b/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverLatestIT.java
@@ -841,7 +841,7 @@ public void testGeoOutputTypes() throws Throwable {
           regularStatement, false, "geoJson", "OBJECT", "java.lang.String", Types.STRUCT);
 
       testGeoOutputTypeSingle(
-          regularStatement, true, "geoJson", "GEOGRAPHY", "java.lang.String", Types.STRUCT);
+          regularStatement, true, "geoJson", "GEOGRAPHY", "java.lang.String", Types.VARCHAR);
 
       testGeoOutputTypeSingle(
           regularStatement, false, "wkt", "VARCHAR", "java.lang.String", Types.VARCHAR);
@@ -989,10 +989,10 @@ public void testGeometryOutputTypes() throws Throwable {
           "insert into t_geo2 values ('POINT(0 0)'), ('LINESTRING(1 1, 2 2)')");
 
       testGeometryOutputTypeSingle(
-          regularStatement, true, "geoJson", "GEOMETRY", "java.lang.String", Types.STRUCT);
+          regularStatement, true, "geoJson", "GEOMETRY", "java.lang.String", Types.VARCHAR);
 
       testGeometryOutputTypeSingle(
-          regularStatement, true, "wkt", "GEOMETRY", "java.lang.String", Types.STRUCT);
+          regularStatement, true, "wkt", "GEOMETRY", "java.lang.String", Types.VARCHAR);
 
     } finally {
       if (regularStatement != null) {