CB-5369. Added API for transaction log for commits

server/bundles/io.cloudbeaver.server/schema/service.events.graphqls

@@ -35,6 +35,8 @@ enum CBServerEventId {
 
     cb_database_output_log_updated,
 
+    cb_transactional_count @since(version: "24.3.3")
+
     cb_session_task_info_updated @since(version: "24.3.1")
 }
 
@@ -62,7 +64,9 @@ enum CBEventTopic {
     cb_session_task, @since(version: "24.3.1")
 
     cb_datasource_connection,
-    cb_delete_temp_folder
+    cb_delete_temp_folder,
+
+    cb_transaction @since(version: "24.3.3")
 }
 
 # Base server event interface
@@ -212,6 +216,16 @@ type WSDataSourceConnectEvent implements CBServerEvent {
     timestamp: Int!
 }
 
+# Datasource count event in transactional mode
+type WSTransactionalCountEvent implements CBServerEvent {
+    id: CBServerEventId!
+    topicId: CBEventTopic
+    contextId: String!
+    projectId: String!
+    connectionId: String!
+    transactionalCount: Int!
+}
+
 extend type Query {
     emptyEvent: Boolean
 }

server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls

@@ -223,6 +223,24 @@ type DynamicTraceProperty {
     description: String
 }
 
+####################################################
+# Transactional info
+####################################################
+type TransactionLogInfoItem {
+    id: Int!
+    time: DateTime!
+    type: String!
+    queryString: String!
+    durationMs: Int!
+    rows: Int!
+    result: String!
+}
+type TransactionLogInfos {
+    count: Int!
+    transactionLogInfos: [TransactionLogInfoItem!]!
+}
+
+
 ####################################################
 # Query and Mutation
 ####################################################
@@ -331,6 +349,12 @@ extend type Mutation {
         dataFormat: ResultDataFormat
     ): AsyncTaskInfo!
 
+    getTransactionLogInfo(
+        projectId: ID!,
+        connectionId: ID!,
+        contextId: ID!
+    ): TransactionLogInfos!
+
     # Close results (free resources)
     sqlResultClose(projectId: ID, connectionId: ID!, contextId: ID!, resultId: ID!): Boolean!
 

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebTransactionLogInfo.java

@@ -0,0 +1,24 @@
+/*
+ * DBeaver - Universal Database Manager
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model;
+
+import org.jkiss.code.NotNull;
+
+import java.util.List;
+
+public record WebTransactionLogInfo(@NotNull List<WebTransactionLogItemInfo> transactionLogInfos, int count) {
+}

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebTransactionLogItemInfo.java

@@ -0,0 +1,31 @@
+/*
+ * DBeaver - Universal Database Manager
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+
+public record WebTransactionLogItemInfo(
+    @Nullable Integer id,
+    @NotNull String time,
+    @NotNull String type,
+    @NotNull String queryString,
+    long durationMs,
+    long rows,
+    String result
+) {
+}

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/DBWServiceSQL.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.
@@ -20,6 +20,7 @@
 import io.cloudbeaver.WebAction;
 import io.cloudbeaver.model.WebAsyncTaskInfo;
 import io.cloudbeaver.model.WebConnectionInfo;
+import io.cloudbeaver.model.WebTransactionLogInfo;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.service.DBWService;
 import org.jkiss.code.NotNull;
@@ -202,4 +203,10 @@
     WebAsyncTaskInfo asyncSqlCommitTransaction(
         @NotNull WebSession webSession,
         @NotNull WebSQLContextInfo sqlContext);
+
+    @WebAction
+    WebTransactionLogInfo getTransactionLogInfo(
+        @NotNull WebSession webSession,
+        @NotNull WebSQLContextInfo sqlContext
+    );
 }

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLContextInfo.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.
@@ -26,22 +26,36 @@
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.model.DBConstants;
 import org.jkiss.dbeaver.model.DBUtils;
 import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
 import org.jkiss.dbeaver.model.exec.*;
 import org.jkiss.dbeaver.model.exec.trace.DBCTrace;
+import org.jkiss.dbeaver.model.messages.ModelMessages;
 import org.jkiss.dbeaver.model.meta.Property;
+import io.cloudbeaver.model.WebTransactionLogInfo;
+import io.cloudbeaver.model.WebTransactionLogItemInfo;
 import org.jkiss.dbeaver.model.qm.QMTransactionState;
 import org.jkiss.dbeaver.model.qm.QMUtils;
+import org.jkiss.dbeaver.model.qm.meta.QMMConnectionInfo;
+import org.jkiss.dbeaver.model.qm.meta.QMMStatementExecuteInfo;
+import org.jkiss.dbeaver.model.qm.meta.QMMTransactionInfo;
+import org.jkiss.dbeaver.model.qm.meta.QMMTransactionSavepointInfo;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSDataContainer;
 import org.jkiss.dbeaver.model.struct.rdb.DBSCatalog;
 import org.jkiss.dbeaver.model.struct.rdb.DBSSchema;
+import org.jkiss.dbeaver.model.websocket.event.WSTransactionalCountEvent;
 import org.jkiss.dbeaver.utils.RuntimeUtils;
 import org.jkiss.utils.CommonUtils;
 
 import java.lang.reflect.InvocationTargetException;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -59,6 +73,9 @@
 
     private final AtomicInteger resultId = new AtomicInteger();
 
+    public static final DateTimeFormatter ISO_DATE_FORMAT = DateTimeFormatter.ofPattern(DBConstants.DEFAULT_ISO_TIMESTAMP_FORMAT)
+        .withZone(ZoneId.of("UTC"));
+
     public WebSQLContextInfo(
         WebSQLProcessor processor, String id, String catalogName, String schemaName, String projectId
     ) throws DBCException {
@@ -216,7 +233,71 @@
 
     }
 
+    public WebTransactionLogInfo getTransactionLogInfo() {
+        DBCExecutionContext context = processor.getExecutionContext();
+        return getTransactionLogInfo(context);
+    }
+
+    @NotNull
+    private WebTransactionLogInfo getTransactionLogInfo(DBCExecutionContext executionContext) {
+        int updateCount = 0;
+        List<WebTransactionLogItemInfo> logItemInfos = new ArrayList<>();
+        QMMConnectionInfo sessionInfo = QMUtils.getCurrentConnection(executionContext);
+        if (sessionInfo.isTransactional()) {
+            QMMTransactionInfo txnInfo = sessionInfo.getTransaction();
+            if (txnInfo != null) {
+                QMMTransactionSavepointInfo sp = txnInfo.getCurrentSavepoint();
+                QMMStatementExecuteInfo execInfo = sp.getLastExecute();
+                for (QMMStatementExecuteInfo exec = execInfo; exec != null && exec.getSavepoint() == sp; exec = exec.getPrevious()) {
+                    if (exec.getUpdateRowCount() > 0 ) {
+                        DBCExecutionPurpose purpose = exec.getStatement().getPurpose();
+                        if (!exec.hasError() && purpose != DBCExecutionPurpose.META && purpose != DBCExecutionPurpose.UTIL) {
+                            updateCount++;
+                        }
+                        generateLogInfo(logItemInfos, exec, purpose, updateCount);
+                    }
+                }
+            }
+        } else {
+            QMMStatementExecuteInfo execInfo = sessionInfo.getExecutionStack();
+            for (QMMStatementExecuteInfo exec = execInfo; exec != null; exec = exec.getPrevious()) {
+                if (exec.getUpdateRowCount() > 0) {
+                    updateCount++;
+                    DBCExecutionPurpose purpose = exec.getStatement().getPurpose();
+                    generateLogInfo(logItemInfos, exec, purpose, updateCount);
+                }
+            }
+        }
+        return new WebTransactionLogInfo(logItemInfos, updateCount);
+    }
+
+    private void generateLogInfo(
+        @NotNull List<WebTransactionLogItemInfo> logItemInfos,
+        @NotNull QMMStatementExecuteInfo exec,
+        @NotNull DBCExecutionPurpose purpose,
+        int id
+    ) {
+        String type = "SQL / " + purpose.getTitle();
+        String dateTime = ISO_DATE_FORMAT.format(Instant.ofEpochMilli(exec.getCloseTime()));
+        String result = ModelMessages.controls_querylog_success;
+        if (exec.hasError()) {
+            if (exec.getErrorCode() == 0) {
+                result = exec.getErrorMessage();
+            } else if (exec.getErrorMessage() == null) {
+                result = ModelMessages.controls_querylog_error + exec.getErrorCode() + "]"; //$NON-NLS-1$
+            } else {
+                result = "[" + exec.getErrorCode() + "] " + exec.getErrorMessage(); //$NON-NLS-1$ //$NON-NLS-2$
+            }
+        }
+
+        logItemInfos.add(
+            new WebTransactionLogItemInfo(id, dateTime, type, exec.getQueryString(),
+                exec.getDuration(), exec.getUpdateRowCount(), result)
+        );
+    }
+
+
     public WebAsyncTaskInfo commitTransaction() {
         DBCExecutionContext context = processor.getExecutionContext();
         DBCTransactionManager txnManager = DBUtils.getTransactionManager(context);
         WebAsyncTaskProcessor<String> runnable = new WebAsyncTaskProcessor<>() {
@@ -238,6 +319,17 @@
                         RuntimeUtils.formatExecutionTime(System.currentTimeMillis() - txnInfo.getTransactionStartTime())
                     );
                 }
+                processor.getWebSession().addSessionEvent(
+                    new WSTransactionalCountEvent(
+                        processor.getWebSession().getSessionId(),
+                        processor.getWebSession().getUserId(),
+                        getProjectId(),
+                        getId(),
+                        getConnectionId(),
+                        0
+                    )
+                );
+
             }
         };
         return getWebSession().createAndRunAsyncTask("Commit transaction", runnable);
@@ -265,6 +357,16 @@
                         txnInfo.getUpdateCount(),
                         RuntimeUtils.formatExecutionTime(System.currentTimeMillis() - txnInfo.getTransactionStartTime())
                     );
+                    processor.getWebSession().addSessionEvent(
+                        new WSTransactionalCountEvent(
+                            processor.getWebSession().getSessionId(),
+                            processor.getWebSession().getUserId(),
+                            getProjectId(),
+                            getId(),
+                            getConnectionId(),
+                            0
+                        )
+                    );
                 }
             }
         };