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

CB-1666 qm: save filtered user queries with correct type

Browse Source
This commit is contained in:
Alexander Skoblikov
2022-02-16 15:36:12 +03:00
parent b8a1f64022
commit ae8eda0281
1 changed files with 6 additions and 3 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
+6 -3
View File
@@ -176,9 +176,8 @@ public class WebSQLProcessor implements WebSessionProvider {
final WebSQLDataFilter webDataFilter = filter;
final String sqlQueryText = sql;
SQLQuery sqlQuery = new SQLQuery(context.getDataSource(), sqlQueryText);
DBExecUtils.tryExecuteRecover(monitor, connection.getDataSource(), param -> {
try (DBCSession session = context.openSession(monitor, DBCExecutionPurpose.USER, "Execute SQL")) {
try (DBCSession session = context.openSession(monitor, resolveQueryPurpose(dataFilter), "Execute SQL")) {
AbstractExecutionSource source = new AbstractExecutionSource(
dataContainer,
session.getExecutionContext(),
@@ -229,7 +228,7 @@ public class WebSQLProcessor implements WebSessionProvider {
(resultId == null ? null : contextInfo.getResults(resultId)),
dataContainer);
DBExecUtils.tryExecuteRecover(monitor, connection.getDataSource(), param -> {
try (DBCSession session = executionContext.openSession(monitor, DBCExecutionPurpose.USER, "Read data from container")) {
try (DBCSession session = executionContext.openSession(monitor, resolveQueryPurpose(dataFilter), "Read data from container")) {
try (WebSQLQueryDataReceiver dataReceiver = new WebSQLQueryDataReceiver(contextInfo, dataContainer, dataFormat)) {
DBCStatistics statistics = dataContainer.readData(
new WebExecutionSource(dataContainer, executionContext, this),
@@ -776,4 +775,8 @@ public class WebSQLProcessor implements WebSessionProvider {
}
return dataSource.getInfo().supportsMultipleResults() ? MAX_RESULTS_COUNT : 1;
}
private static DBCExecutionPurpose resolveQueryPurpose(DBDDataFilter filter) {
return filter.hasFilters() ? DBCExecutionPurpose.USER_FILTERED : DBCExecutionPurpose.USER;
}
}