From 610869864282a52bcfb3f6332a52eb85903186b6 Mon Sep 17 00:00:00 2001
From: Dawid Heyman <dawid.heyman@snowflake.com>
Date: Fri, 9 Aug 2024 18:40:17 +0200
Subject: [PATCH 1/2] SNOW-1618131: Remove error_on_generic_pruner integration
 test (#1866)

---
 .../client/jdbc/SnowflakeDriverIT.java        | 34 -------------------
 1 file changed, 34 deletions(-)

diff --git a/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverIT.java b/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverIT.java
index a66dd4c4a..a540adcec 100644
--- a/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverIT.java
+++ b/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverIT.java
@@ -1293,40 +1293,6 @@ private void addBindBatch(PreparedStatement preparedStatement, java.sql.Date sql
     preparedStatement.addBatch();
   }
 
-  @Test
-  @ConditionalIgnoreRule.ConditionalIgnore(condition = RunningOnGithubAction.class)
-  public void test31448() throws Throwable {
-    try (Connection connection = getConnection();
-        Statement statement = connection.createStatement()) {
-
-      statement.execute(
-          "alter session set enable_fix_31448_2=2, " + "error_on_generic_pruner=true;");
-
-      statement.execute("alter session set timestamp_type_mapping=timestamp_ntz");
-
-      statement.execute("create or replace table " + "bug56658(iv number, tsv timestamp_ntz)");
-      statement.execute(
-          "insert into bug56658 select seq8(), "
-              + "timestampadd(day, seq8(), '1970-01-13 00:00:00'::timestamp_ntz)\n"
-              + "from table(generator(rowcount=>20))");
-
-      connection
-          .unwrap(SnowflakeConnectionV1.class)
-          .getSfSession()
-          .setTimestampMappedType(SnowflakeType.TIMESTAMP_NTZ);
-      Timestamp ts = buildTimestamp(1970, 0, 15, 10, 14, 30, 0);
-      try (PreparedStatement preparedStatement =
-          connection.prepareStatement(
-              "select iv, tsv from bug56658 where tsv" + " >= ? and tsv <= ? order by iv;")) {
-        statement.execute("alter session set timestamp_type_mapping=timestamp_ntz");
-        Timestamp ts2 = buildTimestamp(1970, 0, 18, 10, 14, 30, 0);
-        preparedStatement.setTimestamp(1, ts);
-        preparedStatement.setTimestamp(2, ts2);
-        preparedStatement.executeQuery();
-      }
-    }
-  }
-
   @Test
   public void testBind() throws Throwable {
     ResultSetMetaData resultSetMetaData = null;

From e2a092d4af72b1047b2250c87619efd4b1266c22 Mon Sep 17 00:00:00 2001
From: Waleed Fateem <72769898+sfc-gh-wfateem@users.noreply.github.com>
Date: Fri, 9 Aug 2024 12:50:19 -0500
Subject: [PATCH 2/2] SNOW-1614292: java.lang.ClassNotFoundException:
 org.slf4j.LoggerFactor (#1862)

Fixes issue where the absence of the slf4j-api library from the classpath
results in a NoClassDefFoundError/ClassNotFoundException because
the class org.slf4j.LoggerFactory can't be found
---
 .../net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java
index 751b47d19..bd5a3945e 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java
@@ -75,8 +75,6 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Class for uploading/downloading files
@@ -100,7 +98,6 @@ public class SnowflakeFileTransferAgent extends SFBaseFileTransferAgent {
 
   private static final String localFSFileSep = systemGetProperty("file.separator");
   private static final int DEFAULT_PARALLEL = 10;
-  private static final Logger log = LoggerFactory.getLogger(SnowflakeFileTransferAgent.class);
 
   private final String command;