Fix japicmp

snowflakedb · Apr 2, 2024 · 2b490b5 · 2b490b5
1 parent 3ec0b41
commit 2b490b5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/src/main/java/net/snowflake/client/core/SFBaseResultSet.java b/src/main/java/net/snowflake/client/core/SFBaseResultSet.java
@@ -97,7 +97,9 @@ public abstract class SFBaseResultSet {
 
   public abstract Object getObject(int columnIndex) throws SFException;
 
-  public abstract Array getArray(int columnIndex) throws SFException;
+  public Array getArray(int columnIndex) throws SFException {
+    throw new UnsupportedOperationException();
+  }
 
   public abstract BigDecimal getBigDecimal(int columnIndex) throws SFException;
 

diff --git a/src/main/java/net/snowflake/client/core/SFJsonResultSet.java b/src/main/java/net/snowflake/client/core/SFJsonResultSet.java
@@ -41,7 +41,10 @@ public abstract class SFJsonResultSet extends SFBaseResultSet {
 
   protected final Converters converters;
 
+  @Deprecated protected final TimeZone sessionTimeZone;
+
   protected SFJsonResultSet(TimeZone sessionTimeZone, Converters converters) {
+    this.sessionTimeZone = sessionTimeZone;
     this.sessionTimezone = sessionTimeZone;
     this.converters = converters;
   }

diff --git a/src/main/java/net/snowflake/client/core/structs/StructureTypeHelper.java b/src/main/java/net/snowflake/client/core/structs/StructureTypeHelper.java
@@ -5,7 +5,8 @@
 @SnowflakeJdbcInternalApi
 public class StructureTypeHelper {
   private static final String STRUCTURED_TYPE_ENABLED_PROPERTY_NAME = "STRUCTURED_TYPE_ENABLED";
-  private static boolean structuredTypeEnabled = true;
+  private static boolean structuredTypeEnabled =
+          Boolean.valueOf(System.getProperty(STRUCTURED_TYPE_ENABLED_PROPERTY_NAME));
 
   public static boolean isStructureTypeEnabled() {
     return structuredTypeEnabled;

diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeBaseResultSet.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeBaseResultSet.java
@@ -1550,12 +1550,8 @@ public <T> Map<String, T> getMap(int columnIndex, Class<T> type) throws SQLExcep
     int scale = valueFieldMetadata.getScale();
     TimeZone tz = sfBaseResultSet.getSessionTimeZone();
     Object object = getObject(columnIndex);
-    Map<String, Object> map;
-    if (object instanceof JsonSqlInput) {
-      map = mapSFExceptionToSQLException(() -> prepareMapWithValues(object, type));
-    } else {
-      map = (Map<String, Object>) object;
-    }
+    Map<String, Object> map =
+        mapSFExceptionToSQLException(() -> prepareMapWithValues(object, type));
     Map<String, T> resultMap = new HashMap<>();
     for (Map.Entry<String, Object> entry : map.entrySet()) {
       if (SQLData.class.isAssignableFrom(type)) {

diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSetStructuredTypesLatestIT.java b/src/test/java/net/snowflake/client/jdbc/ResultSetStructuredTypesLatestIT.java
@@ -37,7 +37,7 @@ public class ResultSetStructuredTypesLatestIT extends BaseJDBCTest {
   private final ResultSetFormatType queryResultFormat;
 
   public ResultSetStructuredTypesLatestIT() {
-    this(ResultSetFormatType.NATIVE_ARROW);
+    this(ResultSetFormatType.JSON);
   }
 
   protected ResultSetStructuredTypesLatestIT(ResultSetFormatType queryResultFormat) {