CB-5369. Added event for get count

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,12 +41,14 @@
 import org.jkiss.dbeaver.model.impl.DefaultServerOutputReader;
 import org.jkiss.dbeaver.model.navigator.DBNDatabaseItem;
 import org.jkiss.dbeaver.model.navigator.DBNNode;
+import org.jkiss.dbeaver.model.qm.QMUtils;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.sql.*;
 import org.jkiss.dbeaver.model.sql.parser.SQLParserContext;
 import org.jkiss.dbeaver.model.sql.parser.SQLRuleManager;
 import org.jkiss.dbeaver.model.sql.parser.SQLScriptParser;
 import org.jkiss.dbeaver.model.struct.*;
+import org.jkiss.dbeaver.model.websocket.event.WSTransactionalCountEvent;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;
@@ -164,7 +166,7 @@ public WebSQLExecuteInfo processQuery(
         @Nullable WebSQLDataFilter filter,
         @Nullable WebDataFormat dataFormat,
         @NotNull WebSession webSession,
-        boolean readLogs) throws DBWebException {
+        boolean readLogs) throws DBWebException, DBCException {
         if (filter == null) {
             // Use default filter
             filter = new WebSQLDataFilter();
@@ -270,6 +272,9 @@ public WebSQLExecuteInfo processQuery(
         } catch (DBException e) {
             throw new DBWebException("Error executing query", e);
         }
+        if (!DBUtils.getTransactionManager(context).isAutoCommit()) {
+            sendTransactionalEvent(contextInfo);
+        }
         executeInfo.setDuration(System.currentTimeMillis() - startTime);
         if (executeInfo.getResults().length == 0) {
             executeInfo.setStatusMessage("No Data");
@@ -354,17 +359,17 @@ public WebSQLExecuteInfo updateResultsDataBatch(
 
         WebSQLExecuteInfo result = new WebSQLExecuteInfo();
         List<WebSQLQueryResults> queryResults = new ArrayList<>();
+        boolean isAutoCommitEnabled = true;
+
         for (var rowIdentifier : rowIdentifierList) {
             Map<DBSDataManipulator.ExecuteBatch, Object[]> resultBatches = new LinkedHashMap<>();
             DBSDataManipulator dataManipulator = generateUpdateResultsDataBatch(
                 monitor, resultsInfo, rowIdentifier, updatedRows, deletedRows, addedRows, dataFormat, resultBatches, keyReceiver);
 
-
             DBCExecutionContext executionContext = getExecutionContext(dataManipulator);
             try (DBCSession session = executionContext.openSession(monitor, DBCExecutionPurpose.USER, "Update data in container")) {
                 DBCTransactionManager txnManager = DBUtils.getTransactionManager(executionContext);
                 boolean revertToAutoCommit = false;
-                boolean isAutoCommitEnabled = true;
                 DBCSavepoint savepoint = null;
                 if (txnManager != null) {
                     isAutoCommitEnabled = txnManager.isAutoCommit();
@@ -421,6 +426,10 @@ public WebSQLExecuteInfo updateResultsDataBatch(
         }
         getUpdatedRowsInfo(resultsInfo, newResultSetRows, dataFormat, monitor);
 
+        if (!isAutoCommitEnabled) {
+            sendTransactionalEvent(contextInfo);
+        }
+
         WebSQLQueryResultSet updatedResultSet = new WebSQLQueryResultSet();
         updatedResultSet.setResultsInfo(resultsInfo);
         updatedResultSet.setColumns(resultsInfo.getAttributes());
@@ -437,6 +446,17 @@ public WebSQLExecuteInfo updateResultsDataBatch(
         return result;
     }
 
+    private void sendTransactionalEvent(WebSQLContextInfo contextInfo) {
+        int count = QMUtils.getTransactionState(getExecutionContext()).getUpdateCount();
+        webSession.addSessionEvent(
+            new WSTransactionalCountEvent(
+                contextInfo.getProjectId(),
+                contextInfo.getConnectionId(),
+                count
+            )
+        );
+    }
+
     private void getUpdatedRowsInfo(
         @NotNull WebSQLResultsInfo resultsInfo,
         @NotNull Set<WebSQLQueryResultSetRow> newResultSetRows,

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java

@@ -319,7 +319,6 @@ public WebSQLExecuteInfo updateResultsDataBatch(
                     }
                 }
             );
-            // do event
             return result[0];
         } catch (DBException e) {
             throw new DBWebException("Error updating resultset data", e);