Skip to content

Remove workaround for recently fixed MS SQL JDBC driver issue #7133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 1 commit into from
Oct 21, 2025
Merged

Remove workaround for recently fixed MS SQL JDBC driver issue #7133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions api/src/org/labkey/api/data/CachedResultSets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static CachedResultSet create(ResultSet rs, boolean cacheMetaData, int ma

public static CachedResultSet create(ResultSet rsIn, boolean cacheMetaData, int maxRows, @Nullable StackTraceElement[] stackTrace, QueryLogging queryLogging) throws SQLException
{
try (ResultSet rs = new LoggingResultSetWrapper(rsIn, queryLogging)) // TODO: avoid is we're passed a read-only and empty one??
try (ResultSet rs = new LoggingResultSetWrapper(rsIn, queryLogging)) // TODO: avoid if we're passed a read-only and empty one??
{
// Snowflake auto-closes metadata after reading the last row, so cache that metadata first
ResultSetMetaData md = cacheMetaData ? new CachedResultSetMetaData(rs.getMetaData()) : rs.getMetaData();
Expand All @@ -56,17 +56,7 @@ public static CachedResultSet create(ResultSet rsIn, boolean cacheMetaData, int
list.add(factory.getRowMap(rs));

// If we have another row, then we're not complete
boolean isComplete = true;

// TODO: Remove this try/catch once SQL Server driver fixes getIndexInfo()
try
{
isComplete = !rs.next();
}
catch (SQLException ignored)
{
// tolerate this for now
}
boolean isComplete = !rs.next();

return new CachedResultSet(md, list, isComplete, stackTrace);
}
Expand Down