Skip to content

Commit

Permalink
Merge branch 'master' into Snow-1213120-Reuse-Connections-3
Browse files Browse the repository at this point in the history
  • Loading branch information
sfc-gh-ext-simba-jf committed Aug 13, 2024
2 parents 8e27bb0 + e2a092d commit 8e72c34
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;

Expand Down
34 changes: 0 additions & 34 deletions src/test/java/net/snowflake/client/jdbc/SnowflakeDriverIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 8e72c34

Please sign in to comment.