Merge branch 'master' into SNOW-1016470-increase-code-coverage-to-at-least-90

Author: sfc-gh-ext-simba-vb

src/main/java/net/snowflake/client/core/SessionUtil.java

@@ -386,8 +386,6 @@ private static WorkloadIdentityAttestation getWorkloadIdentityAttestation(SFLogi
 
   static void checkIfExperimentalAuthnEnabled(AuthenticatorType authenticator) throws SFException {
     if (authenticator.equals(AuthenticatorType.PROGRAMMATIC_ACCESS_TOKEN)
-        || authenticator.equals(AuthenticatorType.OAUTH_CLIENT_CREDENTIALS)
-        || authenticator.equals(AuthenticatorType.OAUTH_AUTHORIZATION_CODE)
         || authenticator.equals(AuthenticatorType.WORKLOAD_IDENTITY)) {
       boolean experimentalAuthenticationMethodsEnabled =
           Boolean.parseBoolean(systemGetEnv("SF_ENABLE_EXPERIMENTAL_AUTHENTICATION"));

src/main/java/net/snowflake/client/core/bind/BindUploader.java

@@ -52,11 +52,11 @@ public class BindUploader implements Closeable {
 
   private int fileCount = 0;
 
-  private final DateFormat timestampFormat;
+  private final DateFormat utcTimestampFormat;
+  private final DateFormat localTimestampFormat;
   private final DateFormat dateFormat;
   private final SimpleDateFormat timeFormat;
   private final String createStageSQL;
-  private Calendar cal;
 
   static class ColumnTypeDataPair {
     public String type;
@@ -86,15 +86,20 @@ private BindUploader(SFBaseSession session, String stageDir) {
             + " field_optionally_enclosed_by='\"'"
             + ")";
 
-    cal = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
-    cal.clear();
+    Calendar utcCalendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+    utcCalendar.clear();
 
-    this.timestampFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.");
-    this.timestampFormat.setCalendar(cal);
+    Calendar localCalendar = new GregorianCalendar(TimeZone.getDefault());
+    localCalendar.clear();
+
+    this.utcTimestampFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.");
+    this.utcTimestampFormat.setCalendar(utcCalendar);
+    this.localTimestampFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.");
+    this.localTimestampFormat.setCalendar(localCalendar);
     this.dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-    this.dateFormat.setCalendar(cal);
+    this.dateFormat.setCalendar(utcCalendar);
     this.timeFormat = new SimpleDateFormat("HH:mm:ss.");
-    this.timeFormat.setCalendar(cal);
+    this.timeFormat.setCalendar(utcCalendar);
   }
 
   private synchronized String synchronizedDateFormat(String o) {
@@ -113,7 +118,7 @@ private synchronized String synchronizedTimeFormat(String o) {
     int nano = times.right;
 
     Time v1 = new Time(sec * 1000);
-    String formatWithDate = timestampFormat.format(v1) + String.format("%09d", nano);
+    String formatWithDate = utcTimestampFormat.format(v1) + String.format("%09d", nano);
     // Take out the Date portion of the formatted string. Only time data is needed.
     return formatWithDate.substring(11);
   }
@@ -159,16 +164,12 @@ private synchronized String synchronizedTimestampFormat(String o, String type) {
     // For timestamp_ntz, use UTC timezone. For timestamp_ltz, use the local timezone to minimise
     // the gap.
     if ("TIMESTAMP_LTZ".equals(type)) {
-      TimeZone tz = TimeZone.getDefault();
-      cal.setTimeZone(tz);
-      cal.clear();
-      timestampFormat.setCalendar(cal);
       offsetId = ZoneId.systemDefault().getRules().getOffset(Instant.ofEpochMilli(v1.getTime()));
+      return localTimestampFormat.format(v1) + String.format("%09d", nano) + " " + offsetId;
     } else {
       offsetId = ZoneOffset.UTC;
+      return utcTimestampFormat.format(v1) + String.format("%09d", nano) + " " + offsetId;
     }
-
-    return timestampFormat.format(v1) + String.format("%09d", nano) + " " + offsetId;
   }
 
   /**

src/test/java/net/snowflake/client/core/SessionUtilTest.java

@@ -256,13 +256,11 @@ public void shouldProperlyCheckIfExperimentalAuthEnabled() {
       snowflakeUtilMockedStatic
           .when(() -> SnowflakeUtil.systemGetEnv("SF_ENABLE_EXPERIMENTAL_AUTHENTICATION"))
           .thenReturn(null);
-      assertThrows(
-          SFException.class,
+      assertDoesNotThrow(
           () ->
               SessionUtil.checkIfExperimentalAuthnEnabled(
                   AuthenticatorType.OAUTH_AUTHORIZATION_CODE));
-      assertThrows(
-          SFException.class,
+      assertDoesNotThrow(
           () ->
               SessionUtil.checkIfExperimentalAuthnEnabled(
                   AuthenticatorType.OAUTH_CLIENT_CREDENTIALS));

src/test/java/net/snowflake/client/jdbc/BindingDataLatestIT.java

@@ -6,11 +6,14 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.sql.Connection;
+import java.sql.Date;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Calendar;
 import java.util.TimeZone;
 import net.snowflake.client.AbstractDriverIT;
@@ -288,6 +291,55 @@ public void testTimestampBindingWithLTZTypeForDayLightSavingTimeZone() throws SQ
     }
   }
 
+  /**
+   * Test that binding TIMESTAMP_LTZ does not affect other date time bindings time zones as a side
+   * effect
+   *
+   * <p>This test cannot run on the GitHub testing because of the "ALTER SESSION SET
+   * CLIENT_STAGE_ARRAY_BINDING_THRESHOLD" This command should be executed with the system admin.
+   *
+   * @throws SQLException
+   */
+  @Test
+  @DontRunOnGithubActions
+  public void testTimestampLtzBindingNoLongerBreaksOtherDatetimeBindings() throws SQLException {
+    TimeZone.setDefault(TimeZone.getTimeZone("America/Chicago"));
+    try (Connection connection = getConnection();
+        Statement statement = connection.createStatement()) {
+      try {
+        statement.execute(
+            "create or replace table stageinsertdates(ind int, t1 timestamp_ltz, d1 date)");
+        Date date1 =
+            new java.sql.Date(
+                ZonedDateTime.of(2016, 2, 19, 0, 0, 0, 0, ZoneId.systemDefault())
+                    .toInstant()
+                    .toEpochMilli());
+        Timestamp ts1 = new Timestamp(date1.getTime());
+        // insert using stage binding
+        statement.execute("ALTER SESSION SET CLIENT_STAGE_ARRAY_BINDING_THRESHOLD = 1");
+        try (PreparedStatement prepStatement =
+            connection.prepareStatement("insert into stageinsertdates values (?,?, ?)")) {
+          prepStatement.setInt(1, 1);
+          prepStatement.setTimestamp(2, ts1);
+          prepStatement.setDate(3, date1);
+          prepStatement.addBatch();
+          prepStatement.executeBatch();
+          prepStatement.getConnection().commit();
+        }
+
+        try (ResultSet rs1 = statement.executeQuery("select * from stageinsertdates")) {
+          assertTrue(rs1.next());
+
+          assertEquals(1, rs1.getInt(1));
+          assertEquals(ts1, rs1.getTimestamp(2));
+          assertEquals(date1, rs1.getDate(3));
+        }
+      } finally {
+        TimeZone.setDefault(origTz);
+      }
+    }
+  }
+
   public void executePsStatementForTimestampTest(
       Connection connection, String tableName, Timestamp timestamp) throws SQLException {
     try (PreparedStatement prepStatement =