From 2198d5f69f7b03848bf8f6e44be22ef5d966c79b Mon Sep 17 00:00:00 2001
From: Alexey <wrouds@gmail.com>
Date: Wed, 17 Apr 2024 21:36:47 +0800
Subject: [PATCH 01/11] fix: remove extra space for settings (#2557)

---
 .../plugin-settings-panel/src/SettingsPanel/SettingsList.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/packages/plugin-settings-panel/src/SettingsPanel/SettingsList.tsx b/webapp/packages/plugin-settings-panel/src/SettingsPanel/SettingsList.tsx
index 4fcd61946a..6857c2ff0d 100644
--- a/webapp/packages/plugin-settings-panel/src/SettingsPanel/SettingsList.tsx
+++ b/webapp/packages/plugin-settings-panel/src/SettingsPanel/SettingsList.tsx
@@ -46,7 +46,7 @@ export const SettingsList = observer<Props>(function SettingsList({ treeData, so
       {list.map(({ group, settings }) => (
         <SettingsGroup key={group.id} group={group} source={source} settings={settings} />
       ))}
-      <div style={{ height: 'calc(100% - 100px)' }} />
+      <div style={{ height: 'calc(100% - 100px)' }} hidden />
     </Container>
   );
 });

From e355cdc953882a3d2cb1dec8bff8211438a7c169 Mon Sep 17 00:00:00 2001
From: Alexey <wrouds@gmail.com>
Date: Wed, 17 Apr 2024 21:41:48 +0800
Subject: [PATCH 02/11] fix: vscode update launch task (#2558)

---
 .vscode/launch.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 7a20f1048b..0245c35f3e 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -19,7 +19,6 @@
       "type": "java",
       "name": "CloudBeaver CE",
       "cwd": "${workspaceFolder}/workspace-dev-ce",
-      "preLaunchTask": "Generate dev proprties for CBCE",
       "request": "launch",
       "mainClass": "org.jkiss.dbeaver.launcher.DBeaverLauncher",
       "windows": {

From 49247ade5da47a154c2c6641c303326a5fecb75b Mon Sep 17 00:00:00 2001
From: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
Date: Mon, 22 Apr 2024 11:11:11 +0200
Subject: [PATCH 03/11] CB_2403 chore: update README

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index deb8e66fc4..d671deca23 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,22 @@ You can see live demo of CloudBeaver here: https://demo.cloudbeaver.io
 
 ## Changelog
 
+### 24.0.3. 2024-04-22
+- Unauthorized access vulnerability was fixed;
+- Added the ability for users to configure personal settings for the interface, SQL editor, and data viewer through the settings panel;
+- Added the ability to backup of the internal database before schema migration (for H2);
+- Different bug fixes and enhancements have been made.
+
+### 24.0.2. 2024-04-08
+- Added the ability to import data to the database from CSV file;
+- Implemented support for utilizing environment variables within connection configurations;
+- The ability to select a case for column names has been added to CSV export;
+- A new Apache Kyuubi driver has been added;
+- Trino driver has been updated to version 438;
+- Clickhouse driver has been updated to version 0.6.0-patch2;
+- Have enhanced security of H2 connection;
+- Different bug fixes and enhancements have been made.
+
 ### 24.0.1. 2024-03-25
 - Added support for two modes for committing changes to the database:
   - Auto-commit transfers all changes that you make immediately to the database;

From 51ef899922cf3e3416d06d18f090691e21d65056 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Tue, 23 Apr 2024 07:59:58 +0200
Subject: [PATCH 04/11] Cb 4270 row counter add cancel button for big tables
 (#2545)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* CB-4270 adds cancel option for load total count of rows in table

* CB-4270 adds ui for load total count of rows in table

* CB-4270 fix: task cancels in a true way

* CB-4270 cleanup

* CB-4270 cancel load total count on close table tab

* CB-4270 cancel load total count on close sql editor tab

* CB-4270 fix: cancel close only task if it is not already cancelled

* CB-4270 chore: tasks -> cancelLoadTotalCountTasks

* CB-4270 stops counting rows when tab closes

* CB-4270 reverts incorrect calls of cancelLoadTotalCount

* CB-4270 reverts ToolsActions unneeded props

* CB-4270 pr fixes

* СB-4270 cancel load total count for refresh action

* CB-4270 fix: place cancelLoadTotalCount to DatabaseDataSource

* CB-4270 fix: cancel load rows in refresh data in data source

* CB-4270 cancels load on close result set tab

* CB-4270 refactor: move cancelLoadTotalCount to resultsetdatasource

* CB-4270 cancel load total count execute only for resultsetdatasource

* CB-4270 adds constraint for TableFooterRowCount

* CB-4270 fix: do not load new value if cancelled rows loading

* CB-4270 cleanup

* Revert "CB-4270 cleanup"

This reverts commit f8bffa253ad4c83c41108c0f582fd7db8770b7bf.

* CB-4270 pr fixes

* CB-4270 pr fixes

* CB-4270 deletes cross icon icon

* CB-4270 DataSources has correct tree of calls for cancel and dispose functions

* CB-4270 cleanup

* chore: add experimental cancellable promise implementation

* CB-4270 pr fixes: remove unneeded disposes + close results in close result tab flow

* CB-4270 removes closeResults abstraction leak in ResultSetDataSource extended classes

* CB-4270 removes unused context in data sources

* CB-4270 adds loader for CancelTotalCountAction on cancel task action

* CB-4270 cancel row count job fix

* CB-4270 cancel row counter with notification

* CB-4270 pr fixes

* CB-4270 pr fixes

---------

Co-authored-by: Aleksei Potsetsuev <wrouds@gmail.com>
Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
Co-authored-by: Ainur <ainur.iagudin@dbeaver.com>
---
 .../service/sql/impl/WebServiceSQL.java       |   2 +-
 .../src/Containers/GroupClose.m.css           |   7 +
 .../configs/webpack.product.dev.config.js     |   7 +
 .../src/TaskScheduler/CancelError.ts          |  15 +
 .../src/TaskScheduler/ITaskNew.ts             |  43 ++
 .../src/TaskScheduler/TaskNew.ts              | 386 ++++++++++++++++++
 .../core-localization/src/locales/en.ts       |   7 +
 .../core-localization/src/locales/it.ts       |   7 +
 .../core-localization/src/locales/ru.ts       |   7 +
 .../core-localization/src/locales/zh.ts       |   7 +
 .../src/ContainerDataSource.ts                |  36 +-
 .../DatabaseDataModel/DatabaseDataModel.ts    |   4 +-
 .../DatabaseDataModel/DatabaseDataSource.ts   |  14 +-
 .../DatabaseDataModel/IDatabaseDataSource.ts  |   5 +-
 .../src/ResultSetDataSource.ts                |  53 ++-
 .../TableFooter/CancelTotalCountAction.m.css  |  27 ++
 .../TableFooter/CancelTotalCountAction.tsx    |  46 +++
 .../TableViewer/TableFooter/TableFooter.tsx   |   4 +-
 .../TableFooter/TableFooterRowCount.tsx       |  49 +--
 .../TableFooter/TotalCountAction.tsx          |  44 ++
 .../plugin-data-viewer/src/locales/en.ts      |   9 +
 .../plugin-data-viewer/src/locales/it.ts      |   9 +
 .../plugin-data-viewer/src/locales/ru.ts      |   9 +
 .../plugin-data-viewer/src/locales/zh.ts      |   9 +
 .../plugin-sql-editor/src/QueryDataSource.ts  |  38 +-
 .../SqlResultTabs/SqlQueryResultService.ts    |   5 +-
 26 files changed, 746 insertions(+), 103 deletions(-)
 create mode 100644 webapp/packages/core-executor/src/TaskScheduler/CancelError.ts
 create mode 100644 webapp/packages/core-executor/src/TaskScheduler/ITaskNew.ts
 create mode 100644 webapp/packages/core-executor/src/TaskScheduler/TaskNew.ts
 create mode 100644 webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/CancelTotalCountAction.m.css
 create mode 100644 webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/CancelTotalCountAction.tsx
 create mode 100644 webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TotalCountAction.tsx

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java
index d6760fb16c..6658935c90 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java
@@ -557,7 +557,7 @@ public void run(DBRProgressMonitor monitor) throws InvocationTargetException, In
                 try {
                     monitor.beginTask("Get row data count", 1);
                     WebSQLResultsInfo results = contextInfo.getResults(resultsId);
-                    long rowCount = DBUtils.readRowCount(webSession.getProgressMonitor(), contextInfo.getProcessor().getExecutionContext(), results.getDataContainer(), null, this);
+                    long rowCount = DBUtils.readRowCount(monitor, contextInfo.getProcessor().getExecutionContext(), results.getDataContainer(), null, this);
                     this.result = "Row data count completed";
                     this.extendedResults = rowCount;
                 } catch (Throwable e) {
diff --git a/webapp/packages/core-blocks/src/Containers/GroupClose.m.css b/webapp/packages/core-blocks/src/Containers/GroupClose.m.css
index 31102daba0..53eb7c8668 100644
--- a/webapp/packages/core-blocks/src/Containers/GroupClose.m.css
+++ b/webapp/packages/core-blocks/src/Containers/GroupClose.m.css
@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 .groupClose {
   width: 18px;
   height: 18px;
diff --git a/webapp/packages/core-cli/configs/webpack.product.dev.config.js b/webapp/packages/core-cli/configs/webpack.product.dev.config.js
index 7150331adb..bed686351e 100644
--- a/webapp/packages/core-cli/configs/webpack.product.dev.config.js
+++ b/webapp/packages/core-cli/configs/webpack.product.dev.config.js
@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 const { merge } = require('webpack-merge');
 const { resolve } = require('path');
 const webpack = require('webpack');
diff --git a/webapp/packages/core-executor/src/TaskScheduler/CancelError.ts b/webapp/packages/core-executor/src/TaskScheduler/CancelError.ts
new file mode 100644
index 0000000000..797be2a5a9
--- /dev/null
+++ b/webapp/packages/core-executor/src/TaskScheduler/CancelError.ts
@@ -0,0 +1,15 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+export class CancelError extends Error {
+  constructor(message?: string, options?: ErrorOptions) {
+    super(message, options);
+
+    this.name = 'Cancel Error';
+  }
+}
diff --git a/webapp/packages/core-executor/src/TaskScheduler/ITaskNew.ts b/webapp/packages/core-executor/src/TaskScheduler/ITaskNew.ts
new file mode 100644
index 0000000000..dc0327e77d
--- /dev/null
+++ b/webapp/packages/core-executor/src/TaskScheduler/ITaskNew.ts
@@ -0,0 +1,43 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+export interface ITaskConstructor {
+  readonly prototype: ITask<any>;
+  new <T>(executor: TaskExecutor<T>): ITask<T>;
+
+  reject<T = never>(reason?: any): ITask<T>;
+  cancel<T = never>(reason?: any): ITask<T>;
+  resolve(): ITask<void>;
+  resolve<T>(value: T): ITask<Awaited<T>>;
+  resolve<T>(value: T | PromiseLike<T>): ITask<Awaited<T>>;
+  fromPromise<T>(promise: Promise<T>): ITask<T>;
+  all<T extends readonly unknown[] | []>(values: T): ITask<{ -readonly [P in keyof T]: Awaited<T[P]> }>;
+  allSettled<T extends readonly unknown[] | []>(
+    values: T,
+  ): ITask<{ -readonly [P in keyof T]: { status: 'fulfilled'; value: Awaited<T[P]> } | { status: 'rejected' | 'cancelled'; reason: any } }>;
+}
+
+declare const ITask: ITaskConstructor;
+
+export interface ITask<TValue> extends Promise<TValue>, PromiseLike<TValue> {
+  readonly then: <TResult1 = TValue, TResult2 = never, TResult3 = never>(
+    onFulfilled?: ((value: TValue) => TResult1 | PromiseLike<TResult1>) | null,
+    onRejected?: ((reason: any, cancelled: boolean) => TResult2 | PromiseLike<TResult2>) | null,
+  ) => ITask<TResult1 | TResult2 | TResult3>;
+  readonly catch: <TResult = never>(
+    onRejected?: ((reason: any, cancelled: boolean) => TResult | PromiseLike<TResult>) | null,
+  ) => ITask<TValue | TResult>;
+  readonly finally: (onfinally?: (() => void) | null) => ITask<TValue>;
+  readonly cancel: (reason?: any) => ITask<void>;
+}
+
+export type TaskResolveFn<T> = (reason: T | PromiseLike<T>) => void;
+export type TaskRejectFn = (reason?: any, cancelled?: boolean) => void;
+export type TaskCancelFn = (reason?: any) => ITask<void> | void;
+
+export type TaskExecutor<T> = (resolve: TaskResolveFn<T>, reject: TaskRejectFn, registerCancel: (cancel: TaskCancelFn) => void) => void;
diff --git a/webapp/packages/core-executor/src/TaskScheduler/TaskNew.ts b/webapp/packages/core-executor/src/TaskScheduler/TaskNew.ts
new file mode 100644
index 0000000000..4a53de791e
--- /dev/null
+++ b/webapp/packages/core-executor/src/TaskScheduler/TaskNew.ts
@@ -0,0 +1,386 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { CancelError } from './CancelError';
+import type { ITask, TaskCancelFn, TaskExecutor, TaskRejectFn, TaskResolveFn } from './ITaskNew';
+
+export const NOOP: VoidFunction = Object.freeze(() => {});
+
+// experimental cancellable promise implementation
+export class Task<T> implements ITask<T> {
+  get [Symbol.toStringTag](): string {
+    return 'Task';
+  }
+
+  protected status: 'pending' | 'fulfilled' | 'rejected';
+  private value: any;
+  private fulfillCallbacks: Array<(value: T | PromiseLike<T>) => void>;
+  private rejectCallbacks: Array<(reason?: any, cancelled?: boolean) => void>;
+  private cancelling: boolean;
+  private cancelCallback: TaskCancelFn;
+  private parentTask: Task<any> | null;
+
+  constructor(executor: TaskExecutor<T>) {
+    this.status = 'pending';
+    this.internalCancel = this.internalCancel.bind(this);
+    this.internalResolve = this.internalResolve.bind(this);
+    this.internalReject = this.internalReject.bind(this);
+    this.registerCancel = this.registerCancel.bind(this);
+    this.cancel = this.cancel.bind(this);
+
+    this.fulfillCallbacks = [];
+    this.rejectCallbacks = [];
+    this.cancelCallback = this.internalCancel;
+    this.cancelling = false;
+    this.parentTask = null;
+
+    try {
+      executor(this.internalResolve, this.internalReject, this.registerCancel);
+    } catch (err) {
+      this.internalReject(err);
+    }
+  }
+
+  then<TResult1 = T, TResult2 = never>(
+    onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null,
+    onRejected?: ((reason: any, cancelled: boolean) => TResult2 | PromiseLike<TResult2>) | null,
+  ): Task<TResult1 | TResult2> {
+    const task = new Task<TResult1 | TResult2>(NOOP);
+
+    task.parentTask = this;
+
+    this.subscribeResolve(value => {
+      queueMicrotask(() => {
+        if (typeof onFulfilled !== 'function') {
+          task.internalResolve(value as TResult1);
+          return;
+        }
+
+        console.warn('generate microtask');
+        this.executeValue(
+          value,
+          value => {
+            this.resolvePromise(task, onFulfilled(value as any));
+            // this.promiseResolution(task, onFulfilled(value as any), resolve, reject, registerCancel);
+          },
+          task.internalReject,
+        );
+      });
+    });
+
+    this.subscribeReject((reason, cancelled) => {
+      queueMicrotask(() => {
+        if (typeof onRejected !== 'function') {
+          task.internalReject(reason, cancelled);
+          return;
+        }
+
+        console.warn('generate microtask');
+        this.executeValue(
+          reason,
+          (reason: any) => {
+            this.resolvePromise(task, onRejected(reason, cancelled ?? false) as TResult2);
+            // this.promiseResolution(task, onRejected(reason, cancelled ?? false) as TResult2, resolve, reject, registerCancel);
+          },
+          task.internalReject,
+        );
+      });
+    });
+
+    return task;
+  }
+
+  catch<TResult = never>(onRejected?: ((reason: any, cancelled: boolean) => TResult | PromiseLike<TResult>) | null): Task<T | TResult> {
+    return this.then(undefined, onRejected);
+  }
+
+  finally(onFinally?: (() => void) | null): Task<T> {
+    return this.then(
+      value => {
+        onFinally?.();
+        return value;
+      },
+      reason => {
+        onFinally?.();
+        throw reason;
+      },
+    );
+  }
+
+  cancel(reason?: any): Task<void> {
+    if (this.cancelling) {
+      throw new Error('Task is already cancelling');
+    }
+    this.cancelling = true;
+
+    if (this.parentTask && this.parentTask.status === 'pending') {
+      return this.parentTask.cancel(reason).finally(() => {
+        this.cancelling = false;
+      });
+    }
+
+    return Task.resolve(this.cancelCallback(reason)).finally(() => {
+      this.cancelling = false;
+    });
+  }
+
+  protected internalCancel(reason?: any): void {
+    this.internalReject(reason, true);
+  }
+
+  protected internalResolve(value: T | PromiseLike<T>) {
+    if (this.status === 'pending') {
+      this.status = 'fulfilled';
+      this.value = value;
+
+      this.executeTasks(this.fulfillCallbacks, value, undefined);
+    }
+  }
+
+  protected internalReject(reason?: any, cancelled?: boolean) {
+    if (this.status === 'pending') {
+      cancelled ||= reason instanceof CancelError;
+      if (cancelled && !(reason instanceof CancelError)) {
+        reason = new CancelError(reason, { cause: reason });
+      }
+      this.status = 'rejected';
+      this.value = reason;
+
+      this.executeTasks(this.rejectCallbacks, reason, cancelled);
+    }
+  }
+
+  executeTasks<T>(tasks: ((value: T, cancelled?: boolean) => void)[], value: T, cancelled: any) {
+    this.fulfillCallbacks = [];
+    this.rejectCallbacks = [];
+    this.cancelCallback = this.internalCancel;
+
+    for (const onRejectedCallback of tasks) {
+      onRejectedCallback(value, cancelled);
+    }
+  }
+
+  private registerCancel(cancel: TaskCancelFn): void {
+    let copy = this.cancelCallback;
+    if (copy === this.internalCancel) {
+      copy = NOOP;
+    }
+
+    this.cancelCallback = reason => Task.resolve(copy(reason)).then(() => cancel(reason));
+  }
+
+  private subscribeResolve(resolve: TaskResolveFn<T>): void {
+    switch (this.status) {
+      case 'pending':
+        {
+          this.fulfillCallbacks.push(resolve);
+        }
+        break;
+      case 'fulfilled':
+        resolve(this.value);
+        break;
+    }
+  }
+
+  private subscribeReject(reject: TaskRejectFn): void {
+    switch (this.status) {
+      case 'pending':
+        {
+          this.rejectCallbacks.push(reject);
+        }
+        break;
+      case 'rejected':
+        reject(this.value, this.value instanceof CancelError);
+        break;
+    }
+  }
+
+  static reject<T = never>(reason?: any): Task<T> {
+    return new Task<T>((_, reject) => {
+      reject(reason);
+    });
+  }
+
+  static resolve(): Task<void>;
+  static resolve<T>(value: T): Task<Awaited<T>>;
+  static resolve<T>(value: T | PromiseLike<T>): Task<Awaited<T>>;
+  static resolve<T = void>(value?: T | PromiseLike<T>): Task<Awaited<T>> {
+    if (isPromiseLike(value)) {
+      return value as Task<Awaited<T>>;
+    } else {
+      return new Task(resolve => {
+        resolve(value as any);
+      });
+    }
+  }
+
+  static cancel<T = never>(reason?: any): Task<T> {
+    return new Task<T>((_, reject) => {
+      reject(reason, true);
+    });
+  }
+
+  static fromPromise<T>(promise: PromiseLike<T>): Task<T> {
+    return new Task<T>((resolve, reject) => {
+      promise.then(resolve, reject);
+    });
+  }
+
+  static all<T extends readonly unknown[] | []>(values: T): Task<{ -readonly [P in keyof T]: Awaited<T[P]> }> {
+    return new Task((resolve, reject) => {
+      let counter = 0;
+      const result = [] as { -readonly [P in keyof T]: Awaited<T[P]> };
+
+      if (values.length === 0) {
+        resolve([] as any);
+        return;
+      }
+
+      for (let i = 0; i < values.length; i++) {
+        Task.resolve(values[i]).then(
+          res => {
+            result[i] = res;
+            counter += 1;
+            if (counter === values.length) {
+              resolve(result);
+            }
+          },
+          reason => {
+            reject(reason);
+          },
+        );
+      }
+    });
+  }
+
+  static allSettled<T extends readonly unknown[] | []>(
+    values: T,
+  ): Task<{ -readonly [P in keyof T]: { status: 'fulfilled'; value: Awaited<T[P]> } | { status: 'rejected' | 'cancelled'; reason: any } }> {
+    return new Task(resolve => {
+      let counter = 0;
+      const result = [] as {
+        -readonly [P in keyof T]: { status: 'fulfilled'; value: Awaited<T[P]> } | { status: 'rejected' | 'cancelled'; reason: any };
+      };
+
+      if (values.length === 0) {
+        resolve([] as any);
+        return;
+      }
+
+      for (let i = 0; i < values.length; i++) {
+        Task.resolve(values[i]).then(
+          res => {
+            result[i] = { status: 'fulfilled', value: res };
+            counter += 1;
+            if (counter === values.length) {
+              resolve(result);
+            }
+          },
+          (reason, cancelled) => {
+            result[i] = { status: cancelled ? 'cancelled' : 'rejected', reason };
+            counter += 1;
+            if (counter === values.length) {
+              resolve(result);
+            }
+          },
+        );
+      }
+    });
+  }
+
+  private resolvePromise<T>(promise: Task<any>, value: T | PromiseLike<T>): void {
+    this.executeValue(
+      value,
+      value => {
+        if (parent === value) {
+          throw new TypeError('Cannot resolve task with itself');
+        }
+
+        if (value instanceof Task || value instanceof Promise) {
+          if (value instanceof Task) {
+            promise.registerCancel(reason => value.cancel(reason));
+          }
+          value.then(promise.internalResolve, promise.internalReject);
+          return;
+        }
+
+        if (value && (typeof value === 'object' || typeof value === 'function')) {
+          const then = (value as PromiseLike<any>).then;
+
+          if (typeof then === 'function') {
+            (then as (...args: any[]) => any).call(
+              value,
+              (r: any) => {
+                promise.resolvePromise(value as any, r);
+              },
+              promise.internalReject,
+            );
+            return;
+          }
+        }
+
+        promise.internalResolve(value);
+      },
+      promise.internalReject,
+    );
+  }
+
+  private promiseResolution<T>(
+    parent: Task<any>,
+    value: T | PromiseLike<T>,
+    resolve: (value: T) => void,
+    reject: TaskRejectFn,
+    registerCancel: (cancel: TaskCancelFn) => void,
+  ): void {
+    this.executeValue(
+      value,
+      value => {
+        if (parent === value) {
+          throw new TypeError('Cannot resolve task with itself');
+        }
+
+        if (value instanceof Task || value instanceof Promise) {
+          if (value instanceof Task) {
+            registerCancel(reason => value.cancel(reason));
+          }
+          value.then(resolve, reject);
+          return;
+        }
+
+        if (value && (typeof value === 'object' || typeof value === 'function')) {
+          const then = (value as PromiseLike<any>).then;
+
+          if (typeof then === 'function') {
+            (then as (...args: any[]) => any).call(
+              value,
+              (r: any) => {
+                this.promiseResolution(value as any, r, resolve, reject, registerCancel);
+              },
+              reject,
+            );
+            return;
+          }
+        }
+
+        resolve(value as any);
+      },
+      reject,
+    );
+  }
+
+  private executeValue<T>(value: T, resolve: (value: T) => void, reject: TaskRejectFn) {
+    try {
+      resolve(value);
+    } catch (err) {
+      reject(err, err instanceof CancelError);
+    }
+  }
+}
+
+function isPromiseLike<T>(value: any): value is PromiseLike<T> {
+  return value && typeof value === 'object' && 'then' in value;
+}
diff --git a/webapp/packages/core-localization/src/locales/en.ts b/webapp/packages/core-localization/src/locales/en.ts
index a4f6744b4c..2321167558 100644
--- a/webapp/packages/core-localization/src/locales/en.ts
+++ b/webapp/packages/core-localization/src/locales/en.ts
@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 export default [
   ['name', 'en'],
   ['ui_rename_taken_or_invalid', 'This name is unavailable or invalid'],
diff --git a/webapp/packages/core-localization/src/locales/it.ts b/webapp/packages/core-localization/src/locales/it.ts
index f3d661cafe..310262e88f 100644
--- a/webapp/packages/core-localization/src/locales/it.ts
+++ b/webapp/packages/core-localization/src/locales/it.ts
@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 export default [
   ['name', 'it'],
   ['ui_rename_taken_or_invalid', 'This name is unavailable or invalid'],
diff --git a/webapp/packages/core-localization/src/locales/ru.ts b/webapp/packages/core-localization/src/locales/ru.ts
index 72b6777efc..cd91956513 100644
--- a/webapp/packages/core-localization/src/locales/ru.ts
+++ b/webapp/packages/core-localization/src/locales/ru.ts
@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 export default [
   ['name', 'ru'],
   ['ui_rename_taken_or_invalid', 'Имя занято или недопустимо'],
diff --git a/webapp/packages/core-localization/src/locales/zh.ts b/webapp/packages/core-localization/src/locales/zh.ts
index faedbaa8ff..7c9ce76141 100644
--- a/webapp/packages/core-localization/src/locales/zh.ts
+++ b/webapp/packages/core-localization/src/locales/zh.ts
@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 export default [
   ['name', 'zh'],
   ['ui_rename_taken_or_invalid', 'This name is unavailable or invalid'],
diff --git a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
index 431471c8cf..1e6faa5d96 100644
--- a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
@@ -46,7 +46,7 @@ export class ContainerDataSource extends ResultSetDataSource<IDataContainerOptio
     serviceInjector: IServiceInjector,
     graphQLService: GraphQLService,
     asyncTaskInfoService: AsyncTaskInfoService,
-    private readonly connectionExecutionContextService: ConnectionExecutionContextService,
+    protected connectionExecutionContextService: ConnectionExecutionContextService,
   ) {
     super(serviceInjector, graphQLService, asyncTaskInfoService);
 
@@ -68,9 +68,8 @@ export class ContainerDataSource extends ResultSetDataSource<IDataContainerOptio
   }
 
   async cancel(): Promise<void> {
-    if (this.currentTask) {
-      await this.currentTask.cancel();
-    }
+    await super.cancel();
+    await this.currentTask?.cancel();
   }
 
   async request(prevResults: IDatabaseResultSet[]): Promise<IDatabaseResultSet[]> {
@@ -220,35 +219,6 @@ export class ContainerDataSource extends ResultSetDataSource<IDataContainerOptio
     return prevResults;
   }
 
-  async dispose(): Promise<void> {
-    await this.closeResults(this.results);
-    await this.executionContext?.destroy();
-  }
-
-  private async closeResults(results: IDatabaseResultSet[]) {
-    await this.connectionExecutionContextService.load();
-
-    if (!this.executionContext?.context) {
-      return;
-    }
-
-    for (const result of results) {
-      if (result.id === null) {
-        continue;
-      }
-      try {
-        await this.graphQLService.sdk.closeResult({
-          projectId: result.projectId,
-          connectionId: result.connectionId,
-          contextId: result.contextId,
-          resultId: result.id,
-        });
-      } catch (exception: any) {
-        console.log(`Error closing result (${result.id}):`, exception);
-      }
-    }
-  }
-
   private transformResults(executionContextInfo: IConnectionExecutionContextInfo, results: SqlQueryResults[], limit: number): IDatabaseResultSet[] {
     return results.map<IDatabaseResultSet>((result, index) => ({
       id: result.resultSet?.id || '0',
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts
index d800d469ed..32192e3554 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts
@@ -154,8 +154,8 @@ export class DatabaseDataModel<TOptions, TResult extends IDatabaseDataResult = I
     }
   }
 
-  cancel(): Promise<void> | void {
-    return this.source.cancel();
+  async cancel(): Promise<void> {
+    await this.source.cancel();
   }
 
   resetData(): void {
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts
index 07629988be..f5278b30c8 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts
@@ -9,7 +9,7 @@ import { action, makeObservable, observable, toJS } from 'mobx';
 
 import type { IConnectionExecutionContext } from '@cloudbeaver/core-connections';
 import type { IServiceInjector } from '@cloudbeaver/core-di';
-import { Task } from '@cloudbeaver/core-executor';
+import { ITask, Task } from '@cloudbeaver/core-executor';
 import { ResultDataFormat } from '@cloudbeaver/core-sdk';
 
 import { DatabaseDataActions } from './DatabaseDataActions';
@@ -33,6 +33,7 @@ export abstract class DatabaseDataSource<TOptions, TResult extends IDatabaseData
   error: Error | null;
   executionContext: IConnectionExecutionContext | null;
   outdated: boolean;
+  totalCountRequestTask: ITask<number> | null;
 
   get canCancel(): boolean {
     if (this.activeTask instanceof Task) {
@@ -59,6 +60,7 @@ export abstract class DatabaseDataSource<TOptions, TResult extends IDatabaseData
 
   constructor(serviceInjector: IServiceInjector) {
     this.serviceInjector = serviceInjector;
+    this.totalCountRequestTask = null;
     this.actions = new DatabaseDataActions(this);
     this.access = DatabaseDataAccessMode.Default;
     this.results = [];
@@ -95,6 +97,7 @@ export abstract class DatabaseDataSource<TOptions, TResult extends IDatabaseData
       prevOptions: observable,
       options: observable,
       requestInfo: observable,
+      totalCountRequestTask: observable.ref,
       error: observable.ref,
       executionContext: observable,
       disabled: observable,
@@ -369,11 +372,16 @@ export abstract class DatabaseDataSource<TOptions, TResult extends IDatabaseData
     return this;
   }
 
+  async dispose(): Promise<void> {
+    await this.cancel();
+    await this.executionContext?.destroy();
+  }
+
   abstract request(prevResults: TResult[]): TResult[] | Promise<TResult[]>;
   abstract save(prevResults: TResult[]): Promise<TResult[]> | TResult[];
 
-  abstract dispose(): Promise<void>;
-  abstract loadTotalCount(resultIndex: number): Promise<void>;
+  abstract loadTotalCount(resultIndex: number): Promise<ITask<number>>;
+  abstract cancelLoadTotalCount(): Promise<ITask<number> | null>;
 
   async requestDataAction(): Promise<TResult[] | null> {
     this.prevOptions = toJS(this.options);
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts
index bf6745f95f..7a7f9baa4f 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts
@@ -7,6 +7,7 @@
  */
 import type { IConnectionExecutionContext } from '@cloudbeaver/core-connections';
 import type { IServiceInjector } from '@cloudbeaver/core-di';
+import type { ITask } from '@cloudbeaver/core-executor';
 import type { ResultDataFormat } from '@cloudbeaver/core-sdk';
 
 import type { IDatabaseDataAction, IDatabaseDataActionClass, IDatabaseDataActionInterface } from './IDatabaseDataAction';
@@ -47,6 +48,7 @@ export interface IDatabaseDataSource<TOptions, TResult extends IDatabaseDataResu
   readonly cancelled: boolean;
   readonly serviceInjector: IServiceInjector;
   readonly outdated: boolean;
+  readonly totalCountRequestTask: ITask<number> | null;
 
   isLoadable: () => boolean;
   isReadonly: (resultIndex: number) => boolean;
@@ -82,7 +84,8 @@ export interface IDatabaseDataSource<TOptions, TResult extends IDatabaseDataResu
   setSupportedDataFormats: (dataFormats: ResultDataFormat[]) => this;
   setExecutionContext: (context: IConnectionExecutionContext | null) => this;
   setTotalCount: (resultIndex: number, count: number) => this;
-  loadTotalCount: (resultIndex: number) => Promise<void>;
+  loadTotalCount: (resultIndex: number) => Promise<ITask<number>>;
+  cancelLoadTotalCount: () => Promise<ITask<number> | null>;
 
   retry: () => Promise<void>;
   /** Allows to perform an asynchronous action on the data source, this action will wait previous action to finish and save or load requests.
diff --git a/webapp/packages/plugin-data-viewer/src/ResultSetDataSource.ts b/webapp/packages/plugin-data-viewer/src/ResultSetDataSource.ts
index be89670a59..04aa079a52 100644
--- a/webapp/packages/plugin-data-viewer/src/ResultSetDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/ResultSetDataSource.ts
@@ -6,6 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 import type { IServiceInjector } from '@cloudbeaver/core-di';
+import type { ITask } from '@cloudbeaver/core-executor';
 import type { AsyncTaskInfoService, GraphQLService } from '@cloudbeaver/core-sdk';
 
 import { DatabaseDataSource } from './DatabaseDataModel/DatabaseDataSource';
@@ -20,7 +21,18 @@ export abstract class ResultSetDataSource<TOptions> extends DatabaseDataSource<T
     super(serviceInjector);
   }
 
-  async loadTotalCount(resultIndex: number) {
+  async cancel(): Promise<void> {
+    await super.cancel();
+    await this.cancelLoadTotalCount();
+  }
+
+  async cancelLoadTotalCount(): Promise<ITask<number> | null> {
+    await this.totalCountRequestTask?.cancel();
+
+    return this.totalCountRequestTask;
+  }
+
+  async loadTotalCount(resultIndex: number): Promise<ITask<number>> {
     const executionContext = this.executionContext;
     const executionContextInfo = this.executionContext?.context;
 
@@ -34,7 +46,7 @@ export abstract class ResultSetDataSource<TOptions> extends DatabaseDataSource<T
       throw new Error('Result id must be provided');
     }
 
-    const task = this.asyncTaskInfoService.create(async () => {
+    const asyncTask = this.asyncTaskInfoService.create(async () => {
       const { taskInfo } = await this.graphQLService.sdk.asyncSqlRowDataCount({
         resultsId: result.id!,
         connectionId: executionContextInfo.connectionId,
@@ -45,16 +57,45 @@ export abstract class ResultSetDataSource<TOptions> extends DatabaseDataSource<T
       return taskInfo;
     });
 
-    const count = await executionContext.run(
+    const task = executionContext.run(
       async () => {
-        const info = await this.asyncTaskInfoService.run(task);
+        const info = await this.asyncTaskInfoService.run(asyncTask);
+
         const { count } = await this.graphQLService.sdk.getSqlRowDataCountResult({ taskId: info.id });
+
         return count;
       },
-      () => this.asyncTaskInfoService.cancel(task.id),
-      () => this.asyncTaskInfoService.remove(task.id),
+      () => this.asyncTaskInfoService.cancel(asyncTask.id),
+      () => this.asyncTaskInfoService.remove(asyncTask.id),
     );
 
+    this.totalCountRequestTask = task;
+
+    const count = await task;
     this.setTotalCount(resultIndex, count);
+
+    return this.totalCountRequestTask;
+  }
+
+  async closeResults(results: IDatabaseResultSet[]): Promise<void> {
+    if (!this.executionContext?.context) {
+      return;
+    }
+
+    for (const result of results) {
+      if (result.id === null) {
+        continue;
+      }
+      try {
+        await this.graphQLService.sdk.closeResult({
+          projectId: result.projectId,
+          connectionId: result.connectionId,
+          contextId: result.contextId,
+          resultId: result.id,
+        });
+      } catch (exception: any) {
+        console.log(`Error closing result (${result.id}):`, exception);
+      }
+    }
   }
 }
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/CancelTotalCountAction.m.css b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/CancelTotalCountAction.m.css
new file mode 100644
index 0000000000..8531a5867f
--- /dev/null
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/CancelTotalCountAction.m.css
@@ -0,0 +1,27 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+.action {
+  composes: theme-ripple from global;
+  padding: 0 8px;
+  cursor: pointer;
+  user-select: none;
+}
+
+.action .loader {
+  margin-right: 8px;
+}
+
+.icon {
+  composes: theme-text-error from global;
+}
+
+.cancelText {
+  text-transform: uppercase;
+  font-weight: 700;
+  font-size: 12px;
+}
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/CancelTotalCountAction.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/CancelTotalCountAction.tsx
new file mode 100644
index 0000000000..28502a16d0
--- /dev/null
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/CancelTotalCountAction.tsx
@@ -0,0 +1,46 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { observer } from 'mobx-react-lite';
+
+import { Container, IconButton, Loader, s, useS, useTranslate } from '@cloudbeaver/core-blocks';
+
+import styles from './CancelTotalCountAction.m.css';
+
+interface Props {
+  onClick: VoidFunction;
+  loading: boolean;
+}
+
+export const CancelTotalCountAction = observer<Props>(function CancelTotalCountAction({ onClick, loading }) {
+  const translate = useTranslate();
+  const style = useS(styles);
+
+  function handleClick() {
+    if (loading) {
+      return;
+    }
+
+    onClick();
+  }
+
+  return (
+    <Container
+      className={s(style, { action: true })}
+      title={translate(loading ? 'ui_processing_canceling' : 'ui_processing_cancel')}
+      noWrap
+      center
+      zeroBasis
+      keepSize
+      onClick={handleClick}
+    >
+      {loading && <Loader className={s(style, { loader: true })} small />}
+      {!loading && <IconButton disabled={loading} className={s(style, { icon: true })} name="cross" viewBox="0 0 32 32" />}
+      <span className={s(style, { cancelText: true })}>{translate('ui_processing_cancel')}</span>
+    </Container>
+  );
+});
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
index d8a368448d..e69bf024d0 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
@@ -13,6 +13,7 @@ import { Form, getComputed, ToolsPanel } from '@cloudbeaver/core-blocks';
 import type { IDataContext } from '@cloudbeaver/core-data-context';
 import { useService } from '@cloudbeaver/core-di';
 
+import { ResultSetConstraintAction } from '../../DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction';
 import type { IDatabaseDataModel } from '../../DatabaseDataModel/IDatabaseDataModel';
 import { DataViewerSettingsService } from '../../DataViewerSettingsService';
 import { AutoRefreshButton } from './AutoRefresh/AutoRefreshButton';
@@ -94,6 +95,7 @@ export const TableFooter = observer<Props>(function TableFooter({ resultIndex, m
   }, [model.countGain]);
 
   const disabled = getComputed(() => model.isLoading() || model.isDisabled(resultIndex));
+  const constraint = model.getResult(resultIndex) ? model.source.getAction(resultIndex, ResultSetConstraintAction) : null;
 
   return styled(tableFooterStyles)(
     <ToolsPanel type="secondary" center>
@@ -116,7 +118,7 @@ export const TableFooter = observer<Props>(function TableFooter({ resultIndex, m
           />
         </Form>
       </count>
-      <TableFooterRowCount model={model} resultIndex={resultIndex} />
+      {constraint?.supported && <TableFooterRowCount model={model} resultIndex={resultIndex} />}
       <TableFooterMenu model={model} resultIndex={resultIndex} simple={simple} context={context} />
       {model.source.requestInfo.requestMessage.length > 0 && (
         <time>
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterRowCount.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterRowCount.tsx
index 59181a8fc8..f9abdac440 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterRowCount.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterRowCount.tsx
@@ -7,16 +7,15 @@
  */
 import { observer } from 'mobx-react-lite';
 import { useState } from 'react';
-import styled from 'reshadow';
 
-import { getComputed, ToolsAction, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
+import { isNotNullDefined } from '@cloudbeaver/core-utils';
 
 import type { IDatabaseDataModel } from '../../DatabaseDataModel/IDatabaseDataModel';
 import type { IDatabaseResultSet } from '../../DatabaseDataModel/IDatabaseResultSet';
-import { tableFooterMenuStyles } from './TableFooterMenu/TableFooterMenuItem';
-import classes from './TableFooterRowCount.m.css';
+import { CancelTotalCountAction } from './CancelTotalCountAction';
+import { TotalCountAction } from './TotalCountAction';
 
 interface Props {
   resultIndex: number;
@@ -24,36 +23,40 @@ interface Props {
 }
 
 export const TableFooterRowCount: React.FC<Props> = observer(function TableFooterRowCount({ resultIndex, model }) {
-  const translate = useTranslate();
   const notificationService = useService(NotificationService);
   const [loading, setLoading] = useState(false);
 
-  const result = model.getResult(resultIndex);
-
-  if (!result) {
-    return null;
-  }
-
   async function loadTotalCount() {
     try {
       setLoading(true);
       await model.source.loadTotalCount(resultIndex);
     } catch (exception: any) {
-      notificationService.logException(exception, 'data_viewer_total_count_failed');
+      if (model.source.totalCountRequestTask?.cancelled) {
+        notificationService.logInfo({
+          title: 'data_viewer_total_count_canceled_title',
+          message: 'data_viewer_total_count_canceled_message',
+        });
+      } else {
+        notificationService.logException(exception, 'data_viewer_total_count_failed');
+      }
     } finally {
       setLoading(false);
     }
   }
 
-  const currentCount = result.loadedFully ? result.count : `${result.count}+`;
-  const count = result.totalCount ?? currentCount;
-  const disabled = getComputed(() => model.isLoading() || model.isDisabled(resultIndex));
-
-  return styled(tableFooterMenuStyles)(
-    <div className={classes.wrapper} title={translate('data_viewer_total_count_tooltip')}>
-      <ToolsAction disabled={disabled} loading={loading} icon="/icons/data_row_count.svg" viewBox="0 0 32 32" onClick={loadTotalCount}>
-        <span>{count}</span>
-      </ToolsAction>
-    </div>,
-  );
+  async function cancelTotalCount() {
+    try {
+      await model.source.cancelLoadTotalCount();
+    } catch (e: any) {
+      if (!model.source.totalCountRequestTask?.cancelled) {
+        notificationService.logException(e);
+      }
+    }
+  }
+
+  if (loading) {
+    return <CancelTotalCountAction loading={Boolean(model.source.totalCountRequestTask?.cancelled)} onClick={cancelTotalCount} />;
+  }
+
+  return <TotalCountAction loading={loading} resultIndex={resultIndex} model={model} onClick={loadTotalCount} />;
 });
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TotalCountAction.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TotalCountAction.tsx
new file mode 100644
index 0000000000..7a4259728d
--- /dev/null
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TotalCountAction.tsx
@@ -0,0 +1,44 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { observer } from 'mobx-react-lite';
+import styled from 'reshadow';
+
+import { getComputed, ToolsAction, useTranslate } from '@cloudbeaver/core-blocks';
+
+import type { IDatabaseDataModel } from '../../DatabaseDataModel/IDatabaseDataModel';
+import type { IDatabaseResultSet } from '../../DatabaseDataModel/IDatabaseResultSet';
+import { tableFooterMenuStyles } from './TableFooterMenu/TableFooterMenuItem';
+import classes from './TableFooterRowCount.m.css';
+
+interface Props {
+  onClick: VoidFunction;
+  loading: boolean;
+  resultIndex: number;
+  model: IDatabaseDataModel<any, IDatabaseResultSet>;
+}
+
+export const TotalCountAction = observer<Props>(function TotalCountAction({ onClick, loading, resultIndex, model }) {
+  const result = model.getResult(resultIndex);
+  const translate = useTranslate();
+  const disabled = getComputed(() => model.isLoading() || model.isDisabled(resultIndex));
+
+  if (!result) {
+    return null;
+  }
+
+  const currentCount = result.loadedFully ? result.count : `${result.count}+`;
+  const count = result.totalCount ?? currentCount;
+
+  return styled(tableFooterMenuStyles)(
+    <div className={classes.wrapper} title={translate('data_viewer_total_count_tooltip')}>
+      <ToolsAction disabled={disabled} loading={loading} icon="/icons/data_row_count.svg" viewBox="0 0 32 32" onClick={onClick}>
+        <span>{count}</span>
+      </ToolsAction>
+    </div>,
+  );
+});
diff --git a/webapp/packages/plugin-data-viewer/src/locales/en.ts b/webapp/packages/plugin-data-viewer/src/locales/en.ts
index 8252fcf1f7..c1eba19dd4 100644
--- a/webapp/packages/plugin-data-viewer/src/locales/en.ts
+++ b/webapp/packages/plugin-data-viewer/src/locales/en.ts
@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 export default [
   ['plugin_data_viewer_data_viewer_settings_group', 'Data Viewer'],
   ['table_header_sql_expression', 'Enter a SQL expression to filter results, e.g. column_name=10'],
@@ -45,6 +52,8 @@ export default [
   ['data_viewer_script_preview_error_title', "Can't get the script"],
   ['data_viewer_refresh_result_set', 'Refresh result set'],
   ['data_viewer_total_count_tooltip', 'Get total count'],
+  ['data_viewer_total_count_canceled_title', 'Total count canceled'],
+  ['data_viewer_total_count_canceled_message', 'Statement was cancelled due to user request'],
   ['data_viewer_total_count_failed', 'Failed to get total count'],
   ['data_viewer_model_not_loaded', 'Table model is not loaded'],
   ['settings_data_editor', 'Data Editor'],
diff --git a/webapp/packages/plugin-data-viewer/src/locales/it.ts b/webapp/packages/plugin-data-viewer/src/locales/it.ts
index 8a952d8490..a0b3a9f7ad 100644
--- a/webapp/packages/plugin-data-viewer/src/locales/it.ts
+++ b/webapp/packages/plugin-data-viewer/src/locales/it.ts
@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 export default [
   ['plugin_data_viewer_data_viewer_settings_group', 'Data Viewer'],
   ['table_header_sql_expression', 'Digita una espresione SQL per filtrare i risultati'],
@@ -38,6 +45,8 @@ export default [
   ['data_viewer_presentation_value_content_paste_error', 'Cannot load full text'],
   ['data_viewer_refresh_result_set', 'Refresh result set'],
   ['data_viewer_total_count_tooltip', 'Get total count'],
+  ['data_viewer_total_count_canceled_title', 'Total count canceled'],
+  ['data_viewer_total_count_canceled_message', 'Statement was cancelled due to user request'],
   ['data_viewer_total_count_failed', 'Failed to get total count'],
   ['data_viewer_model_not_loaded', 'Table model is not loaded'],
   ['settings_data_editor', 'Data Editor'],
diff --git a/webapp/packages/plugin-data-viewer/src/locales/ru.ts b/webapp/packages/plugin-data-viewer/src/locales/ru.ts
index 8792885dc2..76629ec648 100644
--- a/webapp/packages/plugin-data-viewer/src/locales/ru.ts
+++ b/webapp/packages/plugin-data-viewer/src/locales/ru.ts
@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 export default [
   ['plugin_data_viewer_data_viewer_settings_group', 'Просмотр данных'],
   ['table_header_sql_expression', 'Введите SQL выражение чтобы отфильтровать результаты, например, column_name=10'],
@@ -39,6 +46,8 @@ export default [
   ['data_viewer_script_preview_error_title', 'Не удалось получить скрипт'],
   ['data_viewer_refresh_result_set', 'Обновить резалт сет'],
   ['data_viewer_total_count_tooltip', 'Получить количество записей'],
+  ['data_viewer_total_count_canceled_title', 'Получение количества записей отменено'],
+  ['data_viewer_total_count_canceled_message', 'Запрос был отменен пользователем'],
   ['data_viewer_total_count_failed', 'Не удалось получить количество записей'],
   ['data_viewer_model_not_loaded', 'Не удалось загрузить модель таблицы'],
   ['settings_data_editor', 'Редактор данных'],
diff --git a/webapp/packages/plugin-data-viewer/src/locales/zh.ts b/webapp/packages/plugin-data-viewer/src/locales/zh.ts
index 7c8babb48c..cb02a92fc8 100644
--- a/webapp/packages/plugin-data-viewer/src/locales/zh.ts
+++ b/webapp/packages/plugin-data-viewer/src/locales/zh.ts
@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 export default [
   ['plugin_data_viewer_data_viewer_settings_group', 'Data Viewer'],
   ['table_header_sql_expression', '输入SQL表达式以过滤结果'],
@@ -46,6 +53,8 @@ export default [
   ['data_viewer_refresh_result_set', 'Refresh result set'],
   ['data_viewer_total_count_failed', 'Failed to get total count'],
   ['data_viewer_total_count_tooltip', 'Get total count'],
+  ['data_viewer_total_count_canceled_title', 'Total count canceled'],
+  ['data_viewer_total_count_canceled_message', 'Statement was cancelled due to user request'],
   ['data_viewer_model_not_loaded', 'Table model is not loaded'],
   ['settings_data_editor', 'Data Editor'],
   ['settings_data_editor_disable_edit_name', 'Disable Edit'],
diff --git a/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts b/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
index 0b5ddcc1cd..5cb9acace8 100644
--- a/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
+++ b/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
@@ -49,7 +49,11 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
     return this.currentTask?.cancelled || false;
   }
 
-  constructor(readonly serviceInjector: IServiceInjector, graphQLService: GraphQLService, asyncTaskInfoService: AsyncTaskInfoService) {
+  constructor(
+    readonly serviceInjector: IServiceInjector,
+    graphQLService: GraphQLService,
+    asyncTaskInfoService: AsyncTaskInfoService,
+  ) {
     super(serviceInjector, graphQLService, asyncTaskInfoService);
 
     this.currentTask = null;
@@ -80,9 +84,8 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
   }
 
   async cancel(): Promise<void> {
-    if (this.currentTask) {
-      await this.currentTask.cancel();
-    }
+    await super.cancel();
+    await this.currentTask?.cancel();
   }
 
   async save(prevResults: IDatabaseResultSet[]): Promise<IDatabaseResultSet[]> {
@@ -252,28 +255,6 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
     }
   }
 
-  private async closeResults(results: IDatabaseResultSet[]) {
-    if (!this.executionContext?.context) {
-      return;
-    }
-
-    for (const result of results) {
-      if (result.id === null) {
-        continue;
-      }
-      try {
-        await this.graphQLService.sdk.closeResult({
-          projectId: result.projectId,
-          connectionId: result.connectionId,
-          contextId: result.contextId,
-          resultId: result.id,
-        });
-      } catch (exception: any) {
-        console.log(`Error closing result (${result.id}):`, exception);
-      }
-    }
-  }
-
   private transformResults(executionContextInfo: IConnectionExecutionContextInfo, results: SqlQueryResults[], limit: number): IDatabaseResultSet[] {
     return results.map<IDatabaseResultSet>((result, index) => ({
       id: result.resultSet?.id || null,
@@ -291,9 +272,4 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
       data: result.resultSet,
     }));
   }
-
-  async dispose(): Promise<void> {
-    await this.closeResults(this.results);
-    await this.cancel();
-  }
 }
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryResultService.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryResultService.ts
index 5d0d8d31ac..a83db3c0f1 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryResultService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryResultService.ts
@@ -7,7 +7,7 @@
  */
 import { injectable } from '@cloudbeaver/core-di';
 import { uuid } from '@cloudbeaver/core-utils';
-import { IDatabaseDataModel, IDatabaseResultSet, TableViewerStorageService } from '@cloudbeaver/plugin-data-viewer';
+import { IDatabaseDataModel, IDatabaseResultSet, ResultSetDataSource, TableViewerStorageService } from '@cloudbeaver/plugin-data-viewer';
 
 import type { IResultGroup, IResultTab, ISqlEditorTabState, IStatisticsTab } from '../ISqlEditorTabState';
 import type { IDataQueryOptions } from '../QueryDataSource';
@@ -165,7 +165,8 @@ export class SqlQueryResultService {
         const model = this.tableViewerStorageService.get(group.modelId);
         // model?.dispose();
 
-        if (model?.isLoading()) {
+        if (model?.source instanceof ResultSetDataSource) {
+          model.source.closeResults(model.getResults());
           model.cancel();
         }
 

From 99b9f6f193a7e630f5b5861239a634e0016ca22f Mon Sep 17 00:00:00 2001
From: alex <48489896+devnaumov@users.noreply.github.com>
Date: Tue, 23 Apr 2024 08:00:56 +0200
Subject: [PATCH 05/11] CB-4932 add alt text to the logo (#2559)

Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
---
 webapp/packages/core-blocks/src/StaticImage.tsx    | 2 +-
 webapp/packages/core-blocks/src/layout/AppLogo.tsx | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/webapp/packages/core-blocks/src/StaticImage.tsx b/webapp/packages/core-blocks/src/StaticImage.tsx
index 509430df6b..e5d2abd4d1 100644
--- a/webapp/packages/core-blocks/src/StaticImage.tsx
+++ b/webapp/packages/core-blocks/src/StaticImage.tsx
@@ -28,5 +28,5 @@ export const StaticImage: React.FC<Props> = function StaticImage({ icon, classNa
 
   const url = isValidUrl(icon) ? icon : GlobalConstants.absoluteUrl(icon);
 
-  return <img className={s(styles, { block }, className)} src={url} title={title} width={width} onClick={onClick} />;
+  return <img alt={title} className={s(styles, { block }, className)} src={url} title={title} width={width} onClick={onClick} />;
 };
diff --git a/webapp/packages/core-blocks/src/layout/AppLogo.tsx b/webapp/packages/core-blocks/src/layout/AppLogo.tsx
index 3dd7e05143..2cfd3f1395 100644
--- a/webapp/packages/core-blocks/src/layout/AppLogo.tsx
+++ b/webapp/packages/core-blocks/src/layout/AppLogo.tsx
@@ -5,13 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { IconOrImage } from '../IconOrImage';
 import { s } from '../s';
 import { useS } from '../useS';
 import styles from './AppLogo.m.css';
 
-
 interface Props {
   title: string;
   onClick?: () => void;
@@ -20,8 +18,8 @@ interface Props {
 export const AppLogo: React.FC<Props> = function AppLogo({ title, onClick }) {
   const style = useS(styles);
   return (
-    <div className={s(style, { container: true })} title={title} onClick={onClick}>
-      <IconOrImage className={s(style, { logo: true })} icon="/icons/logo_sm.svg" />
+    <div tabIndex={0} className={s(style, { container: true })} onClick={onClick}>
+      <IconOrImage title={title} className={s(style, { logo: true })} icon="/icons/logo_sm.svg" />
     </div>
   );
 };

From b1349c7a071536507465932eedfce3d3977cdc78 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Wed, 24 Apr 2024 12:06:18 +0200
Subject: [PATCH 06/11] CB-5036 disables uploading files for readonly tables
 for cells (#2570)

* CB-5036 disables uploading files for readonly tables for cells

* CB-5036 cleanup
---
 .../DataGridContextMenuSaveContentService.ts                   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuSaveContentService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuSaveContentService.ts
index 1e6756cc44..f0296277a1 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuSaveContentService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuSaveContentService.ts
@@ -65,7 +65,8 @@ export class DataGridContextMenuSaveContentService {
       },
       isHidden: context => {
         const format = context.data.model.source.getAction(context.data.resultIndex, ResultSetFormatAction);
-        return !format.isBinary(context.data.key);
+
+        return !format.isBinary(context.data.key) || context.data.model.isReadonly(context.data.resultIndex);
       },
       isDisabled: context => {
         const content = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataContentAction);

From 2a612aea6394200b66d63639f1caf2b030da9d17 Mon Sep 17 00:00:00 2001
From: Georgii <georgii.gvinepadze@dbeaver.com>
Date: Wed, 24 Apr 2024 14:25:33 +0400
Subject: [PATCH 07/11] INF-52 improvements (#2564)

---
 .vscode/tasks.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index f5618a36ac..800242fe07 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -42,7 +42,7 @@
           "package",
           "-q",
           "exec:java",
-          "-Dexec.args=-elk.version ${elk-version} -eclipse.version ${eclipse-version} -config ${workspaceFolder}/../idea-workspace-dbeaver/rcp-gen.properties -productFile ${workspaceFolder}/server/product/web-server/CloudbeaverServer.product -projectsFolder ${workspaceFolder}/../ -eclipse ${workspaceFolder}/../eclipse/Eclipse.app/Contents/Eclipse -output ${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product"
+          "-Dexec.args= -eclipse.version ${eclipse-version} -config ${workspaceFolder}/../idea-workspace-dbeaver/rcp-gen.properties -productFile ${workspaceFolder}/server/product/web-server/CloudbeaverServer.product -projectsFolder ${workspaceFolder}/../ -eclipse ${workspaceFolder}/../eclipse/Eclipse.app/Contents/Eclipse -output ${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product"
         ]
       },
       "windows": {
@@ -50,7 +50,7 @@
           "package",
           "-q",
           "exec:java",
-          "-Dexec.args=-elk.version ${elk-version} -eclipse.version ${eclipse-version} -config ${workspaceFolder}/../idea-workspace-dbeaver/rcp-gen.properties -productFile ${workspaceFolder}/server/product/web-server/CloudbeaverServer.product -projectsFolder ${workspaceFolder}/../ -eclipse ${workspaceFolder}/../eclipse/eclipse -output ${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product"
+          "-Dexec.args= -eclipse.version ${eclipse-version} -config ${workspaceFolder}/../idea-workspace-dbeaver/rcp-gen.properties -productFile ${workspaceFolder}/server/product/web-server/CloudbeaverServer.product -projectsFolder ${workspaceFolder}/../ -eclipse ${workspaceFolder}/../eclipse/eclipse -output ${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product"
         ]
       },
       "options": {

From ccefc5cb9b6a15299f8471364c2d64881c85fdb3 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@dbeaver.com>
Date: Wed, 24 Apr 2024 15:06:01 +0200
Subject: [PATCH 08/11] 24.0.4 version bump

---
 server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF      | 4 ++--
 server/bundles/io.cloudbeaver.model/pom.xml                   | 2 +-
 server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF | 4 ++--
 server/bundles/io.cloudbeaver.product.ce/pom.xml              | 2 +-
 .../META-INF/MANIFEST.MF                                      | 4 ++--
 server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml  | 2 +-
 server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF     | 4 ++--
 server/bundles/io.cloudbeaver.server/pom.xml                  | 2 +-
 .../bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF | 4 ++--
 server/bundles/io.cloudbeaver.service.admin/pom.xml           | 2 +-
 .../bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF  | 4 ++--
 server/bundles/io.cloudbeaver.service.auth/pom.xml            | 2 +-
 .../io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF | 4 ++--
 server/bundles/io.cloudbeaver.service.data.transfer/pom.xml   | 2 +-
 server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF | 4 ++--
 server/bundles/io.cloudbeaver.service.fs/pom.xml              | 2 +-
 .../io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF      | 4 ++--
 server/bundles/io.cloudbeaver.service.metadata/pom.xml        | 2 +-
 .../io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF        | 4 ++--
 server/bundles/io.cloudbeaver.service.rm.nio/pom.xml          | 2 +-
 server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF | 4 ++--
 server/bundles/io.cloudbeaver.service.rm/pom.xml              | 2 +-
 .../io.cloudbeaver.service.security/META-INF/MANIFEST.MF      | 4 ++--
 server/bundles/io.cloudbeaver.service.security/pom.xml        | 2 +-
 server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF      | 4 ++--
 server/bundles/io.cloudbeaver.slf4j/pom.xml                   | 2 +-
 server/features/io.cloudbeaver.ce.drivers.feature/feature.xml | 2 +-
 server/features/io.cloudbeaver.ce.drivers.feature/pom.xml     | 2 +-
 server/features/io.cloudbeaver.product.ce.feature/feature.xml | 2 +-
 server/features/io.cloudbeaver.product.ce.feature/pom.xml     | 2 +-
 server/features/io.cloudbeaver.server.feature/feature.xml     | 2 +-
 server/features/io.cloudbeaver.server.feature/pom.xml         | 2 +-
 server/features/io.cloudbeaver.ws.feature/feature.xml         | 2 +-
 server/features/io.cloudbeaver.ws.feature/pom.xml             | 2 +-
 server/pom.xml                                                | 2 +-
 server/product/web-server/CloudbeaverServer.product           | 2 +-
 server/product/web-server/pom.xml                             | 2 +-
 webapp/packages/product-default/package.json                  | 2 +-
 38 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF
index 576b8a558b..60dd133806 100644
--- a/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Model
 Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true
-Bundle-Version: 1.0.51.qualifier
-Bundle-Release-Date: 20240422
+Bundle-Version: 1.0.52.qualifier
+Bundle-Release-Date: 20240506
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/server/bundles/io.cloudbeaver.model/pom.xml b/server/bundles/io.cloudbeaver.model/pom.xml
index fea9bda0f7..0201154dc8 100644
--- a/server/bundles/io.cloudbeaver.model/pom.xml
+++ b/server/bundles/io.cloudbeaver.model/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.model</artifactId>
-    <version>1.0.51-SNAPSHOT</version>
+    <version>1.0.52-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF
index 411fd0ac8c..6a0a1ba5e7 100644
--- a/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Community Product
 Bundle-SymbolicName: io.cloudbeaver.product.ce;singleton:=true
-Bundle-Version: 24.0.3.qualifier
-Bundle-Release-Date: 20240422
+Bundle-Version: 24.0.4.qualifier
+Bundle-Release-Date: 20240506
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/server/bundles/io.cloudbeaver.product.ce/pom.xml b/server/bundles/io.cloudbeaver.product.ce/pom.xml
index 1103266205..89e000207c 100644
--- a/server/bundles/io.cloudbeaver.product.ce/pom.xml
+++ b/server/bundles/io.cloudbeaver.product.ce/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.product.ce</artifactId>
-    <version>24.0.3-SNAPSHOT</version>
+    <version>24.0.4-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF
index ac6c293c50..8fa240dbf2 100644
--- a/server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Base JDBC drivers
 Bundle-SymbolicName: io.cloudbeaver.resources.drivers.base;singleton:=true
-Bundle-Version: 1.0.96.qualifier
-Bundle-Release-Date: 20240422
+Bundle-Version: 1.0.97.qualifier
+Bundle-Release-Date: 20240506
 Bundle-Vendor: DBeaver Corp
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: io.cloudbeaver.resources.drivers.base
diff --git a/server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml b/server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml
index dcc8b24c3c..ad573e78fe 100644
--- a/server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml
+++ b/server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../</relativePath>
   </parent>
   <artifactId>io.cloudbeaver.resources.drivers.base</artifactId>
-  <version>1.0.96-SNAPSHOT</version>
+  <version>1.0.97-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF
index 254af791f0..2504540dcf 100644
--- a/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Server
 Bundle-SymbolicName: io.cloudbeaver.server;singleton:=true
-Bundle-Version: 24.0.3.qualifier
-Bundle-Release-Date: 20240422
+Bundle-Version: 24.0.4.qualifier
+Bundle-Release-Date: 20240506
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: io.cloudbeaver.server.CBPlatformActivator
diff --git a/server/bundles/io.cloudbeaver.server/pom.xml b/server/bundles/io.cloudbeaver.server/pom.xml
index fa617140a7..4e97ca19f9 100644
--- a/server/bundles/io.cloudbeaver.server/pom.xml
+++ b/server/bundles/io.cloudbeaver.server/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.server</artifactId>
-    <version>24.0.3-SNAPSHOT</version>
+    <version>24.0.4-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF
index fdba571bc7..0e94a42bd2 100644
--- a/server/bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Service - Administration
 Bundle-SymbolicName: io.cloudbeaver.service.admin;singleton:=true
-Bundle-Version: 1.0.95.qualifier
-Bundle-Release-Date: 20240422
+Bundle-Version: 1.0.96.qualifier
+Bundle-Release-Date: 20240506
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/server/bundles/io.cloudbeaver.service.admin/pom.xml b/server/bundles/io.cloudbeaver.service.admin/pom.xml
index 8010852df1..a910c72f4a 100644
--- a/server/bundles/io.cloudbeaver.service.admin/pom.xml
+++ b/server/bundles/io.cloudbeaver.service.admin/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.service.admin</artifactId>
-    <version>1.0.95-SNAPSHOT</version>
+    <version>1.0.96-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF
index 162f1bfcb5..23e556f945 100644
--- a/server/bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Service - Authentication
 Bundle-SymbolicName: io.cloudbeaver.service.auth;singleton:=true
-Bundle-Version: 1.0.95.qualifier
-Bundle-Release-Date: 20240422
+Bundle-Version: 1.0.96.qualifier
+Bundle-Release-Date: 20240506
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/server/bundles/io.cloudbeaver.service.auth/pom.xml b/server/bundles/io.cloudbeaver.service.auth/pom.xml
index 7ed64b99b3..0b23d84c2a 100644
--- a/server/bundles/io.cloudbeaver.service.auth/pom.xml
+++ b/server/bundles/io.cloudbeaver.service.auth/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.service.auth</artifactId>
-    <version>1.0.95-SNAPSHOT</version>
+    <version>1.0.96-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF
index fcde809e6e..a35671be91 100644
--- a/server/bundles/io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Service - Data Transfer
 Bundle-SymbolicName: io.cloudbeaver.service.data.transfer;singleton:=true
-Bundle-Version: 1.0.96.qualifier
-Bundle-Release-Date: 20240422
+Bundle-Version: 1.0.97.qualifier
+Bundle-Release-Date: 20240506
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml b/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml
index d0742c16b5..9e1b79b303 100644
--- a/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml
+++ b/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.service.data.transfer</artifactId>
-    <version>1.0.96-SNAPSHOT</version>
+    <version>1.0.97-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF
index 590f871bf4..ee97252a49 100644
--- a/server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Service - File System
 Bundle-SymbolicName: io.cloudbeaver.service.fs;singleton:=true
-Bundle-Version: 1.0.13.qualifier
-Bundle-Release-Date: 20240422
+Bundle-Version: 1.0.14.qualifier
+Bundle-Release-Date: 20240506
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/server/bundles/io.cloudbeaver.service.fs/pom.xml b/server/bundles/io.cloudbeaver.service.fs/pom.xml
index 1e1b48682a..f9191d49fe 100644
--- a/server/bundles/io.cloudbeaver.service.fs/pom.xml
+++ b/server/bundles/io.cloudbeaver.service.fs/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.service.fs</artifactId>
-    <version>1.0.13-SNAPSHOT</version>
+    <version>1.0.14-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF
index 045d7a5f33..c02d6714eb 100644
--- a/server/bundles/io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Service - Metadata
 Bundle-SymbolicName: io.cloudbeaver.service.metadata;singleton:=true
-Bundle-Version: 1.0.99.qualifier
-Bundle-Release-Date: 20240422
+Bundle-Version: 1.0.100.qualifier
+Bundle-Release-Date: 20240506
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/server/bundles/io.cloudbeaver.service.metadata/pom.xml b/server/bundles/io.cloudbeaver.service.metadata/pom.xml
index decc69b8b4..35c56cc15a 100644
--- a/server/bundles/io.cloudbeaver.service.metadata/pom.xml
+++ b/server/bundles/io.cloudbeaver.service.metadata/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.service.metadata</artifactId>
-    <version>1.0.99-SNAPSHOT</version>
+    <version>1.0.100-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF
index 0aa38c96d5..e18a6a7fdb 100644
--- a/server/bundles/io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Resource manager NIO implementation
 Bundle-SymbolicName: io.cloudbeaver.service.rm.nio;singleton:=true
-Bundle-Version: 1.0.13.qualifier
-Bundle-Release-Date: 20240422
+Bundle-Version: 1.0.14.qualifier
+Bundle-Release-Date: 20240506
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml b/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml
index 2274824381..76d2fb94e6 100644
--- a/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml
+++ b/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.service.rm.nio</artifactId>
-    <version>1.0.13-SNAPSHOT</version>
+    <version>1.0.14-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF
index c09e1fa7fc..7daf6255f7 100644
--- a/server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Service - Resource manager
 Bundle-SymbolicName: io.cloudbeaver.service.rm;singleton:=true
-Bundle-Version: 1.0.48.qualifier
-Bundle-Release-Date: 20240422
+Bundle-Version: 1.0.49.qualifier
+Bundle-Release-Date: 20240506
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/server/bundles/io.cloudbeaver.service.rm/pom.xml b/server/bundles/io.cloudbeaver.service.rm/pom.xml
index 9deb8bd6eb..45a264d0ef 100644
--- a/server/bundles/io.cloudbeaver.service.rm/pom.xml
+++ b/server/bundles/io.cloudbeaver.service.rm/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.service.rm</artifactId>
-    <version>1.0.48-SNAPSHOT</version>
+    <version>1.0.49-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.service.security/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.security/META-INF/MANIFEST.MF
index 9f527ec557..5f63a08fb6 100644
--- a/server/bundles/io.cloudbeaver.service.security/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.service.security/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: Cloudbeaver Web Service - Security
 Bundle-Vendor: DBeaver Corp
 Bundle-SymbolicName: io.cloudbeaver.service.security;singleton:=true
-Bundle-Version: 1.0.51.qualifier
-Bundle-Release-Date: 20240422
+Bundle-Version: 1.0.52.qualifier
+Bundle-Release-Date: 20240506
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/server/bundles/io.cloudbeaver.service.security/pom.xml b/server/bundles/io.cloudbeaver.service.security/pom.xml
index 1d993e9e22..96f9f4706d 100644
--- a/server/bundles/io.cloudbeaver.service.security/pom.xml
+++ b/server/bundles/io.cloudbeaver.service.security/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.service.security</artifactId>
-    <version>1.0.51-SNAPSHOT</version>
+    <version>1.0.52-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF
index 6fd6d1f071..013604affc 100644
--- a/server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: CloudBeaver SLF4j Binding
 Bundle-SymbolicName: io.cloudbeaver.slf4j;singleton:=true
-Bundle-Version: 1.0.11.qualifier
-Bundle-Release-Date: 20240422
+Bundle-Version: 1.0.12.qualifier
+Bundle-Release-Date: 20240506
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/server/bundles/io.cloudbeaver.slf4j/pom.xml b/server/bundles/io.cloudbeaver.slf4j/pom.xml
index a4f01eaaf5..7f1f672c4e 100644
--- a/server/bundles/io.cloudbeaver.slf4j/pom.xml
+++ b/server/bundles/io.cloudbeaver.slf4j/pom.xml
@@ -10,7 +10,7 @@
         <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.slf4j</artifactId>
-    <version>1.0.11-SNAPSHOT</version>
+    <version>1.0.12-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/features/io.cloudbeaver.ce.drivers.feature/feature.xml b/server/features/io.cloudbeaver.ce.drivers.feature/feature.xml
index 3d0f798891..f85e824b43 100644
--- a/server/features/io.cloudbeaver.ce.drivers.feature/feature.xml
+++ b/server/features/io.cloudbeaver.ce.drivers.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="io.cloudbeaver.ce.drivers.feature"
       label="Cloudbeaver CE 3rd Party Drivers"
-      version="1.0.119.qualifier"
+      version="1.0.120.qualifier"
       provider-name="DBeaver Corp">
 
    <plugin id="io.cloudbeaver.resources.drivers.base" download-size="0" install-size="0" version="0.0.0"/>
diff --git a/server/features/io.cloudbeaver.ce.drivers.feature/pom.xml b/server/features/io.cloudbeaver.ce.drivers.feature/pom.xml
index 93cd21b4e7..c77d57e064 100644
--- a/server/features/io.cloudbeaver.ce.drivers.feature/pom.xml
+++ b/server/features/io.cloudbeaver.ce.drivers.feature/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../</relativePath>
   </parent>
   <artifactId>io.cloudbeaver.ce.drivers.feature</artifactId>
-  <version>1.0.119-SNAPSHOT</version>
+  <version>1.0.120-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/server/features/io.cloudbeaver.product.ce.feature/feature.xml b/server/features/io.cloudbeaver.product.ce.feature/feature.xml
index ac8368b99b..68ec9f14f4 100644
--- a/server/features/io.cloudbeaver.product.ce.feature/feature.xml
+++ b/server/features/io.cloudbeaver.product.ce.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
         id="io.cloudbeaver.product.ce.feature"
         label="%featureName"
-        version="24.0.3.qualifier"
+        version="24.0.4.qualifier"
         provider-name="%providerName"
         plugin="io.cloudbeaver.product.ce">
 
diff --git a/server/features/io.cloudbeaver.product.ce.feature/pom.xml b/server/features/io.cloudbeaver.product.ce.feature/pom.xml
index 2b2c565980..9213bd3b2e 100644
--- a/server/features/io.cloudbeaver.product.ce.feature/pom.xml
+++ b/server/features/io.cloudbeaver.product.ce.feature/pom.xml
@@ -10,7 +10,7 @@
         <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.product.ce.feature</artifactId>
-    <version>24.0.3-SNAPSHOT</version>
+    <version>24.0.4-SNAPSHOT</version>
     <packaging>eclipse-feature</packaging>
 
     <build>
diff --git a/server/features/io.cloudbeaver.server.feature/feature.xml b/server/features/io.cloudbeaver.server.feature/feature.xml
index a2f9c7ee24..df7a6b0796 100644
--- a/server/features/io.cloudbeaver.server.feature/feature.xml
+++ b/server/features/io.cloudbeaver.server.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
         id="io.cloudbeaver.server.feature"
         label="%featureName"
-        version="24.0.3.qualifier"
+        version="24.0.4.qualifier"
         provider-name="%providerName"
         plugin="io.cloudbeaver.server">
 
diff --git a/server/features/io.cloudbeaver.server.feature/pom.xml b/server/features/io.cloudbeaver.server.feature/pom.xml
index 3ecd29a3ad..1b675f9c5e 100644
--- a/server/features/io.cloudbeaver.server.feature/pom.xml
+++ b/server/features/io.cloudbeaver.server.feature/pom.xml
@@ -10,6 +10,6 @@
         <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.server.feature</artifactId>
-    <version>24.0.3-SNAPSHOT</version>
+    <version>24.0.4-SNAPSHOT</version>
     <packaging>eclipse-feature</packaging>
 </project>
diff --git a/server/features/io.cloudbeaver.ws.feature/feature.xml b/server/features/io.cloudbeaver.ws.feature/feature.xml
index 4802970615..2ea2bdd848 100644
--- a/server/features/io.cloudbeaver.ws.feature/feature.xml
+++ b/server/features/io.cloudbeaver.ws.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
         id="io.cloudbeaver.ws.feature"
         label="%featureName"
-        version="1.0.49.qualifier"
+        version="1.0.50.qualifier"
         provider-name="%providerName"
         plugin="io.cloudbeaver.model">
 
diff --git a/server/features/io.cloudbeaver.ws.feature/pom.xml b/server/features/io.cloudbeaver.ws.feature/pom.xml
index 9543f2c5c8..b9c7b042e5 100644
--- a/server/features/io.cloudbeaver.ws.feature/pom.xml
+++ b/server/features/io.cloudbeaver.ws.feature/pom.xml
@@ -10,6 +10,6 @@
         <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.ws.feature</artifactId>
-    <version>1.0.49-SNAPSHOT</version>
+    <version>1.0.50-SNAPSHOT</version>
     <packaging>eclipse-feature</packaging>
 </project>
diff --git a/server/pom.xml b/server/pom.xml
index 7ede961de5..96c50806a8 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -19,7 +19,7 @@
 
     <properties>
         <dbeaver-product>CloudBeaver CE</dbeaver-product>
-        <dbeaver-version>24.0.3</dbeaver-version>
+        <dbeaver-version>24.0.4</dbeaver-version>
     </properties>
 
     <modules>
diff --git a/server/product/web-server/CloudbeaverServer.product b/server/product/web-server/CloudbeaverServer.product
index 29d950b45e..15af0ce5ee 100644
--- a/server/product/web-server/CloudbeaverServer.product
+++ b/server/product/web-server/CloudbeaverServer.product
@@ -2,7 +2,7 @@
 <?pde version="3.5"?>
 
 <product name="CloudBeaver ce Server" uid="io.cloudbeaver.product" id="io.cloudbeaver.product.ce.product"
-    application="io.cloudbeaver.product.ce.application" version="24.0.3.qualifier" useFeatures="true"
+    application="io.cloudbeaver.product.ce.application" version="24.0.4.qualifier" useFeatures="true"
     includeLaunchers="false">
 
     <configIni use="default">
diff --git a/server/product/web-server/pom.xml b/server/product/web-server/pom.xml
index 4ec3dd843a..221dd9d4ce 100644
--- a/server/product/web-server/pom.xml
+++ b/server/product/web-server/pom.xml
@@ -9,7 +9,7 @@
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
-    <version>24.0.3-SNAPSHOT</version>
+    <version>24.0.4-SNAPSHOT</version>
     <artifactId>web-server</artifactId>
     <packaging>eclipse-repository</packaging>
     <name>Cloudbeaver Server Product</name>
diff --git a/webapp/packages/product-default/package.json b/webapp/packages/product-default/package.json
index ad17433108..e01c2e96ea 100644
--- a/webapp/packages/product-default/package.json
+++ b/webapp/packages/product-default/package.json
@@ -5,7 +5,7 @@
     "src/**/*.scss",
     "public/**/*"
   ],
-  "version": "24.0.3",
+  "version": "24.0.4",
   "description": "CloudBeaver Community",
   "license": "Apache-2.0",
   "main": "dist/index.js",

From 00f56e8c58e060c4cc9eb99ae8bc331dc79b4963 Mon Sep 17 00:00:00 2001
From: DenisSinelnikov <142215442+DenisSinelnikov@users.noreply.github.com>
Date: Wed, 24 Apr 2024 19:32:41 +0400
Subject: [PATCH 09/11] CB-4854. Change success message (#2569)

Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
---
 .../src/io/cloudbeaver/service/sql/WebSQLProcessor.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
index 0e66210d10..454b4af56e 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
@@ -268,7 +268,7 @@ public WebSQLExecuteInfo processQuery(
         if (executeInfo.getResults().length == 0) {
             executeInfo.setStatusMessage("No Data");
         } else {
-            executeInfo.setStatusMessage("Success");
+            executeInfo.setStatusMessage("Executed");
         }
 
         return executeInfo;

From 6ad136f2fad3b9354f02bdd112af2096f55eebd2 Mon Sep 17 00:00:00 2001
From: Alexander Skoblikov <aleksandr.skoblikov@dbeaver.com>
Date: Wed, 24 Apr 2024 19:33:11 +0400
Subject: [PATCH 10/11] CB-4282 filter redundant '/' in event (#2571)

* CB-4282 filter redundant '/' in event

* CB-4282 update copyright

---------

Co-authored-by: kseniaguzeeva <112612526+kseniaguzeeva@users.noreply.github.com>
---
 .../model/rm/DBNResourceManagerProject.java   | 22 ++++++-------
 .../model/rm/DBNResourceManagerResource.java  | 22 ++++++-------
 .../model/rm/DBNResourceManagerRoot.java      | 31 +++++++++++--------
 .../model/session/WebActionParameters.java    | 22 ++++++-------
 .../server/actions/CBServerAction.java        | 22 ++++++-------
 .../WSEventHandlerWorkspaceConfigUpdate.java  | 22 ++++++-------
 .../server/events/WSLogEventHandler.java      | 22 ++++++-------
 .../navigator/impl/WebServiceNavigator.java   |  6 ++--
 .../service/rm/RMNavigatorModelExtender.java  | 22 ++++++-------
 9 files changed, 98 insertions(+), 93 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerProject.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerProject.java
index 2f86daf19e..576ddce91a 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerProject.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerProject.java
@@ -1,18 +1,18 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
- * All Rights Reserved.
+ * 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
  *
- * NOTICE:  All information contained herein is, and remains
- * the property of DBeaver Corp and its suppliers, if any.
- * The intellectual and technical concepts contained
- * herein are proprietary to DBeaver Corp and its suppliers
- * and may be covered by U.S. and Foreign Patents,
- * patents in process, and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from DBeaver Corp.
+ *     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.rm;
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerResource.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerResource.java
index 57027915fe..824418f6c4 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerResource.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerResource.java
@@ -1,18 +1,18 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
- * All Rights Reserved.
+ * 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
  *
- * NOTICE:  All information contained herein is, and remains
- * the property of DBeaver Corp and its suppliers, if any.
- * The intellectual and technical concepts contained
- * herein are proprietary to DBeaver Corp and its suppliers
- * and may be covered by U.S. and Foreign Patents,
- * patents in process, and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from DBeaver Corp.
+ *     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.rm;
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerRoot.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerRoot.java
index ace684132d..1bdd01bfd3 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerRoot.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerRoot.java
@@ -1,18 +1,18 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
- * All Rights Reserved.
+ * 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
  *
- * NOTICE:  All information contained herein is, and remains
- * the property of DBeaver Corp and its suppliers, if any.
- * The intellectual and technical concepts contained
- * herein are proprietary to DBeaver Corp and its suppliers
- * and may be covered by U.S. and Foreign Patents,
- * patents in process, and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from DBeaver Corp.
+ *     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.rm;
@@ -154,8 +154,13 @@ private void deleteResourceNode(RMProject project, String resourcePath) {
             return;
         }
         var projectNode = getProjectNode(project);
-        var rmResourcePath = Arrays.asList(resourcePath.split("/"));
-        projectNode.ifPresent(dbnResourceManagerProject -> dbnResourceManagerProject.removeChildResourceNode(new ArrayDeque<>(rmResourcePath)));
+        var rmResourcePath = Arrays.stream(resourcePath.split("/"))
+            .filter(CommonUtils::isNotEmpty)
+            .toList();
+        projectNode.ifPresent(
+            dbnResourceManagerProject -> dbnResourceManagerProject.removeChildResourceNode(new ArrayDeque<>(
+                rmResourcePath))
+        );
     }
 
     @NotNull
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebActionParameters.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebActionParameters.java
index 9e2835fa29..c7a681266a 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebActionParameters.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebActionParameters.java
@@ -1,18 +1,18 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
- * All Rights Reserved.
+ * 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
  *
- * NOTICE:  All information contained herein is, and remains
- * the property of DBeaver Corp and its suppliers, if any.
- * The intellectual and technical concepts contained
- * herein are proprietary to DBeaver Corp and its suppliers
- * and may be covered by U.S. and Foreign Patents,
- * patents in process, and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from DBeaver Corp.
+ *     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.session;
 
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/actions/CBServerAction.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/actions/CBServerAction.java
index 6b2c244726..03db51c316 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/actions/CBServerAction.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/actions/CBServerAction.java
@@ -1,18 +1,18 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
- * All Rights Reserved.
+ * 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
  *
- * NOTICE:  All information contained herein is, and remains
- * the property of DBeaver Corp and its suppliers, if any.
- * The intellectual and technical concepts contained
- * herein are proprietary to DBeaver Corp and its suppliers
- * and may be covered by U.S. and Foreign Patents,
- * patents in process, and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from DBeaver Corp.
+ *     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.server.actions;
 
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSEventHandlerWorkspaceConfigUpdate.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSEventHandlerWorkspaceConfigUpdate.java
index c14272ee0d..cd734a0bc0 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSEventHandlerWorkspaceConfigUpdate.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSEventHandlerWorkspaceConfigUpdate.java
@@ -1,18 +1,18 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
- * All Rights Reserved.
+ * 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
  *
- * NOTICE:  All information contained herein is, and remains
- * the property of DBeaver Corp and its suppliers, if any.
- * The intellectual and technical concepts contained
- * herein are proprietary to DBeaver Corp and its suppliers
- * and may be covered by U.S. and Foreign Patents,
- * patents in process, and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from DBeaver Corp.
+ *     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.server.events;
 
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSLogEventHandler.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSLogEventHandler.java
index 6fa0f5be04..015dfefd46 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSLogEventHandler.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSLogEventHandler.java
@@ -1,18 +1,18 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
- * All Rights Reserved.
+ * 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
  *
- * NOTICE:  All information contained herein is, and remains
- * the property of DBeaver Corp and its suppliers, if any.
- * The intellectual and technical concepts contained
- * herein are proprietary to DBeaver Corp and its suppliers
- * and may be covered by U.S. and Foreign Patents,
- * patents in process, and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from DBeaver Corp.
+ *     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.server.events;
 
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java
index 7cc9c8bb85..534ecb2012 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java
@@ -91,9 +91,9 @@ public List<WebNavigatorNodeInfo> getNavigatorNodeChildren(
                 nodeChildren = DBNUtils.getNodeChildrenFiltered(monitor, rootNode, true);
             } else {
                 DBNNode parentNode = navigatorModel.getNodeByPath(monitor, parentPath);
-                    if (parentNode == null) {
-                        throw new DBWebException("Node '" + parentPath + "' not found");
-                    }
+                if (parentNode == null) {
+                    throw new DBWebException("Node '" + parentPath + "' not found");
+                }
                 if (!parentNode.hasChildren(false)) {
                     return EMPTY_NODE_LIST;
                 }
diff --git a/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/RMNavigatorModelExtender.java b/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/RMNavigatorModelExtender.java
index 33612ba51e..b8cb650c4b 100644
--- a/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/RMNavigatorModelExtender.java
+++ b/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/RMNavigatorModelExtender.java
@@ -1,18 +1,18 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
- * All Rights Reserved.
+ * 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
  *
- * NOTICE:  All information contained herein is, and remains
- * the property of DBeaver Corp and its suppliers, if any.
- * The intellectual and technical concepts contained
- * herein are proprietary to DBeaver Corp and its suppliers
- * and may be covered by U.S. and Foreign Patents,
- * patents in process, and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from DBeaver Corp.
+ *     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.service.rm;

From 368c9e21794d6ce60c3d51dffea5a363f58a5927 Mon Sep 17 00:00:00 2001
From: Ainur <59531286+yagudin10@users.noreply.github.com>
Date: Thu, 25 Apr 2024 11:47:24 +0200
Subject: [PATCH 11/11] CB-4796 update drivers for trino, oracle and sqlite
 (#2568)

Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
---
 server/drivers/oracle/pom.xml | 13 +++++++------
 server/drivers/sqlite/pom.xml |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/drivers/oracle/pom.xml b/server/drivers/oracle/pom.xml
index 13c7cf470a..f5cd7a18e3 100644
--- a/server/drivers/oracle/pom.xml
+++ b/server/drivers/oracle/pom.xml
@@ -12,28 +12,29 @@
 
     <properties>
         <deps.output.dir>oracle</deps.output.dir>
+        <oracle.version>23.2.0.0</oracle.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <version>12.2.0.1</version>
+            <artifactId>ojdbc11</artifactId>
+            <version>${oracle.version}</version>
         </dependency>
         <dependency>
             <groupId>com.oracle.database.nls</groupId>
             <artifactId>orai18n</artifactId>
-            <version>12.2.0.1</version>
+            <version>${oracle.version}</version>
         </dependency>
         <dependency>
             <groupId>com.oracle.database.xml</groupId>
-            <artifactId>xdb6</artifactId>
-            <version>12.2.0.1</version>
+            <artifactId>xdb</artifactId>
+            <version>${oracle.version}</version>
         </dependency>
         <dependency>
             <groupId>com.oracle.database.xml</groupId>
             <artifactId>xmlparserv2</artifactId>
-            <version>12.2.0.1</version>
+            <version>${oracle.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/server/drivers/sqlite/pom.xml b/server/drivers/sqlite/pom.xml
index afab9e8310..697622b06d 100644
--- a/server/drivers/sqlite/pom.xml
+++ b/server/drivers/sqlite/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.42.0.0</version>
+            <version>3.44.1.0</version>
         </dependency>
     </dependencies>