opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #650 from dbeaver/fix/CB-1612

Browse Source 
CB-1612 close result set after script execution
This commit is contained in:
Serge Rider
2022-02-11 13:53:47 +03:00
committed by GitHub
parent fdee6f2a15 6864dbdbb2
commit 7c1eb79afa
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
+8 -7
View File
@@ -648,13 +648,14 @@ public class WebSQLProcessor implements WebSessionProvider {
for (int i = 0; i < maxResultsCount; i++) {
WebSQLQueryResults results = new WebSQLQueryResults(webSession, dataFormat);
if (hasResultSet) {
DBCResultSet resultSet = dbStat.openResultSet();
if (resultSet == null) {
break;
}
try (WebSQLQueryDataReceiver dataReceiver = new WebSQLQueryDataReceiver(contextInfo, dataContainer, dataFormat)) {
readResultSet(dbStat.getSession(), resultSet, webDataFilter, dataReceiver);
results.setResultSet(dataReceiver.getResultSet());
try (DBCResultSet resultSet = dbStat.openResultSet()) {
if (resultSet == null) {
break;
}
try (WebSQLQueryDataReceiver dataReceiver = new WebSQLQueryDataReceiver(contextInfo, dataContainer, dataFormat)) {
readResultSet(dbStat.getSession(), resultSet, webDataFilter, dataReceiver);
results.setResultSet(dataReceiver.getResultSet());
}
}
} else {
long updateRowCount = dbStat.getUpdateRowCount();