From f62462fcc5f9ae5cbc3a0dc8bc84e2432740f621 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Mon, 3 Feb 2025 17:38:15 +0100
Subject: [PATCH 01/17] AI assistant place

---
 packages/web/src/icons/FontIcon.svelte |   1 +
 packages/web/src/tabs/QueryTab.svelte  | 151 ++++++++++++++-----------
 2 files changed, 89 insertions(+), 63 deletions(-)

diff --git a/packages/web/src/icons/FontIcon.svelte b/packages/web/src/icons/FontIcon.svelte
index 95feb253f..084ef9b7b 100644
--- a/packages/web/src/icons/FontIcon.svelte
+++ b/packages/web/src/icons/FontIcon.svelte
@@ -148,6 +148,7 @@
     'icon parent-filter-outline': 'mdi mdi-home-alert-outline',
     'icon download': 'mdi mdi-download',
     'icon text': 'mdi mdi-text',
+    'icon ai': 'mdi mdi-head-lightbulb',
 
     'icon run': 'mdi mdi-play',
     'icon chevron-down': 'mdi mdi-chevron-down',
diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index b8198c89b..f01692cac 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -12,6 +12,15 @@
     testEnabled: () => getCurrentEditor()?.isSqlEditor(),
     onClick: () => getCurrentEditor().formatCode(),
   });
+  registerCommand({
+    id: 'query.switchAiAssistant',
+    category: 'Query',
+    name: 'AI Assistant',
+    keyText: 'Shift+Alt+A',
+    icon: 'icon ai',
+    testEnabled: () => isProApp(),
+    onClick: () => getCurrentEditor().toggleAiAssistant(),
+  });
   registerCommand({
     id: 'query.insertSqlJoin',
     category: 'Query',
@@ -89,6 +98,8 @@
   import ToolStripDropDownButton from '../buttons/ToolStripDropDownButton.svelte';
   import { extractQueryParameters, replaceQueryParameters } from 'dbgate-query-splitter';
   import QueryParametersModal from '../modals/QueryParametersModal.svelte';
+  import { isProApp } from '../utility/proTools';
+  import HorizontalSplitter from '../elements/HorizontalSplitter.svelte';
 
   export let tabid;
   export let conid;
@@ -137,6 +148,7 @@
   let domEditor;
   let domToolStrip;
   let intervalId;
+  let isAiAssistantVisible = false;
 
   onMount(() => {
     intervalId = setInterval(() => {
@@ -210,6 +222,10 @@
     visibleResultTabs = !visibleResultTabs;
   }
 
+  export function toggleAiAssistant() {
+    isAiAssistantVisible = !isAiAssistantVisible;
+  }
+
   function getParameterSplitterOptions() {
     if (!queryParameterStyle) {
       return null;
@@ -401,6 +417,7 @@
       { command: 'query.replace' },
       { divider: true },
       { command: 'query.toggleVisibleResultTabs' },
+      { command: 'query.switchAiAssistant', hideDisabled: true },
     ];
   }
 
@@ -423,73 +440,80 @@
 </script>
 
 <ToolStripContainer bind:this={domToolStrip}>
-  <VerticalSplitter isSplitter={visibleResultTabs}>
+  <HorizontalSplitter isSplitter={isAiAssistantVisible} initialSizeRight={300}>
     <svelte:fragment slot="1">
-      {#if driver?.databaseEngineTypes?.includes('sql')}
-        <SqlEditor
-          engine={$connection && $connection.engine}
-          {conid}
-          {database}
-          splitterOptions={driver?.getQuerySplitterOptions('editor')}
-          options={{
-            wrap: enableWrap,
-          }}
-          value={$editorState.value || ''}
-          menu={createMenu()}
-          on:input={e => {
-            setEditorData(e.detail);
-            if (isInitialized) {
-              markTabUnsaved(tabid);
-            }
-            errorMessages = [];
-          }}
-          on:focus={() => {
-            activator.activate();
-            domToolStrip?.activate();
-            invalidateCommands();
-            setTimeout(() => {
-              isInitialized = true;
-            }, 100);
-          }}
-          bind:this={domEditor}
-          onExecuteFragment={(sql, startLine) => executeCore(sql, startLine)}
-          {errorMessages}
-        />
-      {:else}
-        <AceEditor
-          mode={driver?.editorMode || 'sql'}
-          value={$editorState.value || ''}
-          splitterOptions={driver?.getQuerySplitterOptions('editor')}
-          options={{
-            wrap: enableWrap,
-          }}
-          menu={createMenu()}
-          on:input={e => setEditorData(e.detail)}
-          on:focus={() => {
-            activator.activate();
-            domToolStrip?.activate();
-            invalidateCommands();
-          }}
-          bind:this={domEditor}
-        />
-      {/if}
+      <VerticalSplitter isSplitter={visibleResultTabs}>
+        <svelte:fragment slot="1">
+          {#if driver?.databaseEngineTypes?.includes('sql')}
+            <SqlEditor
+              engine={$connection && $connection.engine}
+              {conid}
+              {database}
+              splitterOptions={driver?.getQuerySplitterOptions('editor')}
+              options={{
+                wrap: enableWrap,
+              }}
+              value={$editorState.value || ''}
+              menu={createMenu()}
+              on:input={e => {
+                setEditorData(e.detail);
+                if (isInitialized) {
+                  markTabUnsaved(tabid);
+                }
+                errorMessages = [];
+              }}
+              on:focus={() => {
+                activator.activate();
+                domToolStrip?.activate();
+                invalidateCommands();
+                setTimeout(() => {
+                  isInitialized = true;
+                }, 100);
+              }}
+              bind:this={domEditor}
+              onExecuteFragment={(sql, startLine) => executeCore(sql, startLine)}
+              {errorMessages}
+            />
+          {:else}
+            <AceEditor
+              mode={driver?.editorMode || 'sql'}
+              value={$editorState.value || ''}
+              splitterOptions={driver?.getQuerySplitterOptions('editor')}
+              options={{
+                wrap: enableWrap,
+              }}
+              menu={createMenu()}
+              on:input={e => setEditorData(e.detail)}
+              on:focus={() => {
+                activator.activate();
+                domToolStrip?.activate();
+                invalidateCommands();
+              }}
+              bind:this={domEditor}
+            />
+          {/if}
+        </svelte:fragment>
+        <svelte:fragment slot="2">
+          <ResultTabs tabs={[{ label: 'Messages', slot: 0 }]} {sessionId} {executeNumber} bind:resultCount {driver}>
+            <svelte:fragment slot="0">
+              <SocketMessageView
+                eventName={sessionId ? `session-info-${sessionId}` : null}
+                onMessageClick={handleMesageClick}
+                {executeNumber}
+                startLine={executeStartLine}
+                showProcedure
+                showLine
+                onChangeErrors={handleChangeErrors}
+              />
+            </svelte:fragment>
+          </ResultTabs>
+        </svelte:fragment>
+      </VerticalSplitter>
     </svelte:fragment>
     <svelte:fragment slot="2">
-      <ResultTabs tabs={[{ label: 'Messages', slot: 0 }]} {sessionId} {executeNumber} bind:resultCount {driver}>
-        <svelte:fragment slot="0">
-          <SocketMessageView
-            eventName={sessionId ? `session-info-${sessionId}` : null}
-            onMessageClick={handleMesageClick}
-            {executeNumber}
-            startLine={executeStartLine}
-            showProcedure
-            showLine
-            onChangeErrors={handleChangeErrors}
-          />
-        </svelte:fragment>
-      </ResultTabs>
+      <div>AI Assistant</div>
     </svelte:fragment>
-  </VerticalSplitter>
+  </HorizontalSplitter>
   <svelte:fragment slot="toolstrip">
     <ToolStripCommandSplitButton commands={['query.execute', 'query.executeCurrent']} />
     <ToolStripCommandButton command="query.kill" />
@@ -511,6 +535,7 @@
       icon="icon at"
       title="Query parameter style"
     />
+    <ToolStripCommandButton command="query.switchAiAssistant" hideDisabled />
   </svelte:fragment>
 </ToolStripContainer>
 

From 91fcf4bd721401ac74f4561c87c154174e3de045 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Tue, 4 Feb 2025 08:54:56 +0100
Subject: [PATCH 02/17] query assistant WIP

---
 packages/web/src/query/QueryAiAssistant.svelte | 1 +
 packages/web/src/tabs/QueryTab.svelte          | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 packages/web/src/query/QueryAiAssistant.svelte

diff --git a/packages/web/src/query/QueryAiAssistant.svelte b/packages/web/src/query/QueryAiAssistant.svelte
new file mode 100644
index 000000000..b44912f77
--- /dev/null
+++ b/packages/web/src/query/QueryAiAssistant.svelte
@@ -0,0 +1 @@
+AI Assistant
\ No newline at end of file
diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index f01692cac..4ebd0b50a 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -100,6 +100,7 @@
   import QueryParametersModal from '../modals/QueryParametersModal.svelte';
   import { isProApp } from '../utility/proTools';
   import HorizontalSplitter from '../elements/HorizontalSplitter.svelte';
+  import QueryAiAssistant from '../query/QueryAiAssistant.svelte';
 
   export let tabid;
   export let conid;
@@ -511,7 +512,7 @@
       </VerticalSplitter>
     </svelte:fragment>
     <svelte:fragment slot="2">
-      <div>AI Assistant</div>
+      <QueryAiAssistant />
     </svelte:fragment>
   </HorizontalSplitter>
   <svelte:fragment slot="toolstrip">

From babfcb610867d02fdc3faf2a2110970f22c1400c Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Wed, 5 Feb 2025 18:56:00 +0100
Subject: [PATCH 03/17] AI assistant

---
 .../src/controllers/databaseConnections.js    | 33 +++++++++++++++++++
 packages/web/src/tabs/QueryTab.svelte         |  9 ++++-
 .../src/widgets/WidgetColumnBarItem.svelte    |  4 ++-
 packages/web/src/widgets/WidgetTitle.svelte   | 21 ++++++++++--
 4 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/packages/api/src/controllers/databaseConnections.js b/packages/api/src/controllers/databaseConnections.js
index fd51b5b32..b81fe77cc 100644
--- a/packages/api/src/controllers/databaseConnections.js
+++ b/packages/api/src/controllers/databaseConnections.js
@@ -34,6 +34,8 @@ const pipeForkLogs = require('../utility/pipeForkLogs');
 const crypto = require('crypto');
 const loadModelTransform = require('../utility/loadModelTransform');
 const exportDbModelSql = require('../utility/exportDbModelSql');
+const axios = require('axios');
+const { getAuthProxyUrl } = require('../utility/authProxy');
 
 const logger = getLogger('databaseConnections');
 
@@ -562,4 +564,35 @@ module.exports = {
 
     return true;
   },
+
+  textToSql_meta: true,
+  async textToSql({ conid, database, text, dialect }) {
+    const existing = this.opened.find(x => x.conid == conid && x.database == database);
+    const { structure } = existing || {};
+    if (!structure) return { errorMessage: 'No database structure' };
+    const model = {
+      tables: structure.tables.map(table => ({
+        name: table.pureName,
+        columns: table.columns.map(column => column.columnName),
+        primaryKey: table.primaryKey?.columns?.map(column => column.columnName),
+        foreignKeys: table.foreignKeys.map(fk => ({
+          refTable: fk.refTableName,
+          column: fk.columns[0]?.columnName,
+          refColumn: fk.columns[0]?.refColumnName,
+        })),
+      })),
+    };
+
+    const resp = await axios.default.post(`${getAuthProxyUrl()}/text-to-sql`, {
+      text,
+      model,
+      dialect,
+    });
+
+    if (!resp.data.sql) {
+      return { errorMessage: 'No SQL generated' };
+    }
+
+    return resp.data;
+  },
 };
diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index 4ebd0b50a..c81d2e56f 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -512,7 +512,14 @@
       </VerticalSplitter>
     </svelte:fragment>
     <svelte:fragment slot="2">
-      <QueryAiAssistant />
+      <QueryAiAssistant
+        {conid}
+        {database}
+        {driver}
+        onClose={() => {
+          isAiAssistantVisible = false;
+        }}
+      />
     </svelte:fragment>
   </HorizontalSplitter>
   <svelte:fragment slot="toolstrip">
diff --git a/packages/web/src/widgets/WidgetColumnBarItem.svelte b/packages/web/src/widgets/WidgetColumnBarItem.svelte
index f973957cd..f52f95654 100644
--- a/packages/web/src/widgets/WidgetColumnBarItem.svelte
+++ b/packages/web/src/widgets/WidgetColumnBarItem.svelte
@@ -16,6 +16,7 @@
   export let collapsed = null;
 
   export let storageName = null;
+  export let onClose = null;
 
   let size = 0;
 
@@ -70,7 +71,8 @@
   <WidgetTitle
     clickable={collapsible}
     on:click={collapsible ? () => (visible = !visible) : null}
-    data-testid={$$props['data-testid']}>{title}</WidgetTitle
+    data-testid={$$props['data-testid']}
+    {onClose}>{title}</WidgetTitle
   >
 
   {#if visible}
diff --git a/packages/web/src/widgets/WidgetTitle.svelte b/packages/web/src/widgets/WidgetTitle.svelte
index a4a3bd0f3..b7c692277 100644
--- a/packages/web/src/widgets/WidgetTitle.svelte
+++ b/packages/web/src/widgets/WidgetTitle.svelte
@@ -1,18 +1,35 @@
 <script lang="ts">
+  import FontIcon from '../icons/FontIcon.svelte';
+
   export let clickable = false;
+  export let onClose = null;
 </script>
 
-<div on:click class:clickable {...$$restProps}>
+<div on:click class:clickable {...$$restProps} class="wrapper">
   <slot />
+  {#if onClose}
+    <div class="close" on:click={onClose}>
+      <FontIcon icon="icon close" />
+    </div>
+  {/if}
 </div>
 
 <style>
-  div {
+  .wrapper {
     padding: 5px;
     font-weight: bold;
     text-transform: uppercase;
     background-color: var(--theme-bg-1);
     border: 2px solid var(--theme-border);
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  .close {
+    cursor: pointer;
+  }
+  .close:hover {
+    color: var(--theme-font-hover);
   }
   div.clickable:hover {
     background-color: var(--theme-bg-2);

From f6dcc4bb1fe8cdcf273ee7960ac7ae12a1ae1db0 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Thu, 6 Feb 2025 08:34:21 +0100
Subject: [PATCH 04/17] AI refactor

---
 .../src/controllers/databaseConnections.js    | 24 ++++---------------
 packages/api/src/utility/authProxy.js         |  5 ++++
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/packages/api/src/controllers/databaseConnections.js b/packages/api/src/controllers/databaseConnections.js
index b81fe77cc..65b77ef43 100644
--- a/packages/api/src/controllers/databaseConnections.js
+++ b/packages/api/src/controllers/databaseConnections.js
@@ -35,7 +35,7 @@ const crypto = require('crypto');
 const loadModelTransform = require('../utility/loadModelTransform');
 const exportDbModelSql = require('../utility/exportDbModelSql');
 const axios = require('axios');
-const { getAuthProxyUrl } = require('../utility/authProxy');
+const { callTextToSqlApi } = require('../utility/authProxy');
 
 const logger = getLogger('databaseConnections');
 
@@ -570,29 +570,13 @@ module.exports = {
     const existing = this.opened.find(x => x.conid == conid && x.database == database);
     const { structure } = existing || {};
     if (!structure) return { errorMessage: 'No database structure' };
-    const model = {
-      tables: structure.tables.map(table => ({
-        name: table.pureName,
-        columns: table.columns.map(column => column.columnName),
-        primaryKey: table.primaryKey?.columns?.map(column => column.columnName),
-        foreignKeys: table.foreignKeys.map(fk => ({
-          refTable: fk.refTableName,
-          column: fk.columns[0]?.columnName,
-          refColumn: fk.columns[0]?.refColumnName,
-        })),
-      })),
-    };
 
-    const resp = await axios.default.post(`${getAuthProxyUrl()}/text-to-sql`, {
-      text,
-      model,
-      dialect,
-    });
+    const res = await callTextToSqlApi(text, structure, dialect);
 
-    if (!resp.data.sql) {
+    if (!res.sql) {
       return { errorMessage: 'No SQL generated' };
     }
 
-    return resp.data;
+    return res;
   },
 };
diff --git a/packages/api/src/utility/authProxy.js b/packages/api/src/utility/authProxy.js
index f8bec4025..e0899b91e 100644
--- a/packages/api/src/utility/authProxy.js
+++ b/packages/api/src/utility/authProxy.js
@@ -24,6 +24,10 @@ async function getAwsIamToken(params) {
   return null;
 }
 
+async function callTextToSqlApi(text, structure, dialect) {
+  return null;
+}
+
 module.exports = {
   isAuthProxySupported,
   authProxyGetRedirectUrl,
@@ -32,4 +36,5 @@ module.exports = {
   getAuthProxyUrl,
   supportsAwsIam,
   getAwsIamToken,
+  callTextToSqlApi,
 };

From 825abf82e6326125a5ffc65bf48554efbd46a33b Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Thu, 6 Feb 2025 13:04:15 +0100
Subject: [PATCH 05/17] deep partial deef

---
 packages/types/dbinfo.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/types/dbinfo.d.ts b/packages/types/dbinfo.d.ts
index 6bd700e75..76157cbc8 100644
--- a/packages/types/dbinfo.d.ts
+++ b/packages/types/dbinfo.d.ts
@@ -189,3 +189,9 @@ export interface DatabaseInfoObjects {
 export interface DatabaseInfo extends DatabaseInfoObjects {
   engine?: string;
 }
+
+type DeepPartial<T> = {
+  [K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
+};
+
+export type DatabaseInfoPartial = DeepPartial<DatabaseInfo>;

From 8103c26ca86ba97da98ad07a1f1ecbf1bbfb06ae Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Fri, 7 Feb 2025 13:36:14 +0100
Subject: [PATCH 06/17] tiny db structure

---
 packages/types/dbinfo.d.ts | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/packages/types/dbinfo.d.ts b/packages/types/dbinfo.d.ts
index 76157cbc8..e65ffae17 100644
--- a/packages/types/dbinfo.d.ts
+++ b/packages/types/dbinfo.d.ts
@@ -194,4 +194,31 @@ type DeepPartial<T> = {
   [K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
 };
 
-export type DatabaseInfoPartial = DeepPartial<DatabaseInfo>;
+export interface ColumnReferenceTiny {
+  n: string; // name
+  r?: string; // ref name
+}
+
+export interface PrimaryKeyInfoTiny {
+  c: ColumnReferenceTiny[]; // columns
+}
+
+export interface ForeignKeyInfoTiny {
+  c: ColumnReferenceTiny[]; // columns
+  r: string; // reference table name
+}
+
+export interface ColumnInfoTiny {
+  n: string; // name
+  t: string; // type
+}
+
+export interface TableInfoTiny {
+  n: string; //name
+  o: string; // comment
+  c: ColumnInfoTiny[]; // columns
+}
+
+export interface DatabaseInfoTiny {
+  t: TableInfoTiny[]; // tables
+}

From 93895f3d6f4c2bbdb5a422cf8d3dfd96eea19794 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Fri, 7 Feb 2025 14:34:56 +0100
Subject: [PATCH 07/17] expanded cell view

---
 packages/types/dbinfo.d.ts                            | 6 ++----
 packages/web/src/celldata/JsonCellView.svelte         | 3 ++-
 packages/web/src/celldata/JsonExpandedCellView.svelte | 6 ++++++
 packages/web/src/widgets/CellDataWidget.svelte        | 7 +++++++
 4 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 packages/web/src/celldata/JsonExpandedCellView.svelte

diff --git a/packages/types/dbinfo.d.ts b/packages/types/dbinfo.d.ts
index e65ffae17..6af824080 100644
--- a/packages/types/dbinfo.d.ts
+++ b/packages/types/dbinfo.d.ts
@@ -190,10 +190,6 @@ export interface DatabaseInfo extends DatabaseInfoObjects {
   engine?: string;
 }
 
-type DeepPartial<T> = {
-  [K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
-};
-
 export interface ColumnReferenceTiny {
   n: string; // name
   r?: string; // ref name
@@ -217,6 +213,8 @@ export interface TableInfoTiny {
   n: string; //name
   o: string; // comment
   c: ColumnInfoTiny[]; // columns
+  p?: PrimaryKeyInfoTiny; // primary key
+  f?: ForeignKeyInfoTiny[]; // foreign keys
 }
 
 export interface DatabaseInfoTiny {
diff --git a/packages/web/src/celldata/JsonCellView.svelte b/packages/web/src/celldata/JsonCellView.svelte
index f9589a6fe..ea9633c33 100644
--- a/packages/web/src/celldata/JsonCellView.svelte
+++ b/packages/web/src/celldata/JsonCellView.svelte
@@ -5,6 +5,7 @@
 
   export let selection;
   export let showWholeRow = false;
+  export let expandAll = false;
 
   let json = null;
   let error = null;
@@ -31,7 +32,7 @@
 {:else}
   <div class="outer">
     <div class="inner">
-      <JSONTree value={json} expanded />
+      <JSONTree value={json} {expandAll} expanded />
     </div>
   </div>
 {/if}
diff --git a/packages/web/src/celldata/JsonExpandedCellView.svelte b/packages/web/src/celldata/JsonExpandedCellView.svelte
new file mode 100644
index 000000000..db38ad001
--- /dev/null
+++ b/packages/web/src/celldata/JsonExpandedCellView.svelte
@@ -0,0 +1,6 @@
+<script lang="ts">
+  import JsonCellView from './JsonCellView.svelte';
+  export let selection;
+</script>
+
+<JsonCellView {selection} expandAll />
diff --git a/packages/web/src/widgets/CellDataWidget.svelte b/packages/web/src/widgets/CellDataWidget.svelte
index 367948296..eb64a0c8d 100644
--- a/packages/web/src/widgets/CellDataWidget.svelte
+++ b/packages/web/src/widgets/CellDataWidget.svelte
@@ -20,6 +20,12 @@
       component: JsonCellView,
       single: true,
     },
+    {
+      type: 'jsonExpanded',
+      title: 'Json - expanded',
+      component: JsonExpandedCellView,
+      single: true,
+    },
     {
       type: 'jsonRow',
       title: 'Json - Row',
@@ -84,6 +90,7 @@
   import SelectField from '../forms/SelectField.svelte';
   import { selectedCellsCallback } from '../stores';
   import WidgetTitle from './WidgetTitle.svelte';
+  import JsonExpandedCellView from '../celldata/JsonExpandedCellView.svelte';
 
   let selectedFormatType = 'autodetect';
 

From 69b775a49d0ae039d45557b9ef4434e6f637bda9 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Fri, 7 Feb 2025 15:53:36 +0100
Subject: [PATCH 08/17] fix

---
 packages/web/src/widgets/CellDataWidget.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/web/src/widgets/CellDataWidget.svelte b/packages/web/src/widgets/CellDataWidget.svelte
index eb64a0c8d..379fd3f85 100644
--- a/packages/web/src/widgets/CellDataWidget.svelte
+++ b/packages/web/src/widgets/CellDataWidget.svelte
@@ -114,6 +114,7 @@
         isNative
         value={selectedFormatType}
         on:change={e => (selectedFormatType = e.detail)}
+        data-testid="CellDataWidget_selectFormat"
         options={[
           { value: 'autodetect', label: `Autodetect - ${autodetectFormat.title}` },
           ...formats.map(fmt => ({ label: fmt.title, value: fmt.type })),

From 0ba040a28cc5d860e7ee43b1d98175f95f5e118f Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Fri, 7 Feb 2025 17:21:42 +0100
Subject: [PATCH 09/17] bulma improvement

---
 packages/web/public/bulma.css | 48 +++++++++++++++++------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/packages/web/public/bulma.css b/packages/web/public/bulma.css
index 6492cd0c3..471553f74 100644
--- a/packages/web/public/bulma.css
+++ b/packages/web/public/bulma.css
@@ -2,6 +2,30 @@
   margin: 0 !important;
 }
 
+.m-1 {
+  margin: 0.25rem !important;
+}
+
+.m-2 {
+  margin: 0.5rem !important;
+}
+
+.m-3 {
+  margin: 0.75rem !important;
+}
+
+.m-4 {
+  margin: 1rem !important;
+}
+
+.m-5 {
+  margin: 1.5rem !important;
+}
+
+.m-6 {
+  margin: 3rem !important;
+}
+
 .mt-0 {
   margin-top: 0 !important;
 }
@@ -28,10 +52,6 @@
   margin-bottom: 0 !important;
 }
 
-.m-1 {
-  margin: 0.25rem !important;
-}
-
 .mt-1 {
   margin-top: 0.25rem !important;
 }
@@ -58,10 +78,6 @@
   margin-bottom: 0.25rem !important;
 }
 
-.m-2 {
-  margin: 0.5rem !important;
-}
-
 .mt-2 {
   margin-top: 0.5rem !important;
 }
@@ -88,10 +104,6 @@
   margin-bottom: 0.5rem !important;
 }
 
-.m-3 {
-  margin: 0.75rem !important;
-}
-
 .mt-3 {
   margin-top: 0.75rem !important;
 }
@@ -118,10 +130,6 @@
   margin-bottom: 0.75rem !important;
 }
 
-.m-4 {
-  margin: 1rem !important;
-}
-
 .mt-4 {
   margin-top: 1rem !important;
 }
@@ -148,10 +156,6 @@
   margin-bottom: 1rem !important;
 }
 
-.m-5 {
-  margin: 1.5rem !important;
-}
-
 .mt-5 {
   margin-top: 1.5rem !important;
 }
@@ -178,10 +182,6 @@
   margin-bottom: 1.5rem !important;
 }
 
-.m-6 {
-  margin: 3rem !important;
-}
-
 .mt-6 {
   margin-top: 3rem !important;
 }

From 3d14ca302f654456f964850bfffc13b8d6cd53c0 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Fri, 7 Feb 2025 17:22:24 +0100
Subject: [PATCH 10/17] call complete on cursor

---
 .../api/src/controllers/databaseConnections.js | 18 ++++++++++++++++--
 packages/api/src/utility/authProxy.js          |  5 +++++
 packages/web/src/tabs/QueryTab.svelte          |  2 ++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/packages/api/src/controllers/databaseConnections.js b/packages/api/src/controllers/databaseConnections.js
index 65b77ef43..2a1579efc 100644
--- a/packages/api/src/controllers/databaseConnections.js
+++ b/packages/api/src/controllers/databaseConnections.js
@@ -35,7 +35,7 @@ const crypto = require('crypto');
 const loadModelTransform = require('../utility/loadModelTransform');
 const exportDbModelSql = require('../utility/exportDbModelSql');
 const axios = require('axios');
-const { callTextToSqlApi } = require('../utility/authProxy');
+const { callTextToSqlApi, callCompleteOnCursorApi } = require('../utility/authProxy');
 
 const logger = getLogger('databaseConnections');
 
@@ -573,7 +573,21 @@ module.exports = {
 
     const res = await callTextToSqlApi(text, structure, dialect);
 
-    if (!res.sql) {
+    if (!res?.sql) {
+      return { errorMessage: 'No SQL generated' };
+    }
+
+    return res;
+  },
+
+  completeOnCursor_meta: true,
+  async completeOnCursor({ conid, database, text, dialect, line }) {
+    const existing = this.opened.find(x => x.conid == conid && x.database == database);
+    const { structure } = existing || {};
+    if (!structure) return { errorMessage: 'No database structure' };
+    const res = await callCompleteOnCursorApi(text, structure, dialect, line);
+
+    if (!res?.sql) {
       return { errorMessage: 'No SQL generated' };
     }
 
diff --git a/packages/api/src/utility/authProxy.js b/packages/api/src/utility/authProxy.js
index e0899b91e..f6122c916 100644
--- a/packages/api/src/utility/authProxy.js
+++ b/packages/api/src/utility/authProxy.js
@@ -28,6 +28,10 @@ async function callTextToSqlApi(text, structure, dialect) {
   return null;
 }
 
+async function callCompleteOnCursorApi(cursorId, query, position, dialect) {
+  return null;
+}
+
 module.exports = {
   isAuthProxySupported,
   authProxyGetRedirectUrl,
@@ -37,4 +41,5 @@ module.exports = {
   supportsAwsIam,
   getAwsIamToken,
   callTextToSqlApi,
+  callCompleteOnCursorApi,
 };
diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index c81d2e56f..5c5bf52a4 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -519,6 +519,8 @@
         onClose={() => {
           isAiAssistantVisible = false;
         }}
+        text={$editorValue}
+        getLine={() => domEditor.getEditor().getSelectionRange().start.row}
       />
     </svelte:fragment>
   </HorizontalSplitter>

From a8a3cf729fc804592a3099bd15e45f9b23195d2c Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Fri, 7 Feb 2025 17:46:43 +0100
Subject: [PATCH 11/17] fix

---
 packages/api/src/controllers/databaseConnections.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/api/src/controllers/databaseConnections.js b/packages/api/src/controllers/databaseConnections.js
index 2a1579efc..9211d6821 100644
--- a/packages/api/src/controllers/databaseConnections.js
+++ b/packages/api/src/controllers/databaseConnections.js
@@ -587,7 +587,7 @@ module.exports = {
     if (!structure) return { errorMessage: 'No database structure' };
     const res = await callCompleteOnCursorApi(text, structure, dialect, line);
 
-    if (!res?.sql) {
+    if (!res?.variants) {
       return { errorMessage: 'No SQL generated' };
     }
 

From 89df96ffd567aaa7eb35c251e8078f7d55881cd4 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Mon, 10 Feb 2025 10:21:43 +0100
Subject: [PATCH 12/17] ai

---
 packages/web/src/tabs/QueryTab.svelte | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index 5c5bf52a4..c6f920531 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -521,6 +521,11 @@
         }}
         text={$editorValue}
         getLine={() => domEditor.getEditor().getSelectionRange().start.row}
+        onInsertAtCursor={text => {
+          const editor = domEditor.getEditor();
+          editor.session.insert(editor.getCursorPosition(), text);
+          domEditor?.getEditor()?.focus();
+        }}
       />
     </svelte:fragment>
   </HorizontalSplitter>

From ae8e46e02448734713a2db558839074b4a2dcccf Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Mon, 10 Feb 2025 11:26:57 +0100
Subject: [PATCH 13/17] refactor SQL

---
 .../api/src/controllers/databaseConnections.js   | 16 +++++++++++++++-
 packages/api/src/utility/authProxy.js            |  5 +++++
 packages/web/src/tabs/QueryTab.svelte            | 10 ++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/packages/api/src/controllers/databaseConnections.js b/packages/api/src/controllers/databaseConnections.js
index 9211d6821..57b794c11 100644
--- a/packages/api/src/controllers/databaseConnections.js
+++ b/packages/api/src/controllers/databaseConnections.js
@@ -35,7 +35,7 @@ const crypto = require('crypto');
 const loadModelTransform = require('../utility/loadModelTransform');
 const exportDbModelSql = require('../utility/exportDbModelSql');
 const axios = require('axios');
-const { callTextToSqlApi, callCompleteOnCursorApi } = require('../utility/authProxy');
+const { callTextToSqlApi, callCompleteOnCursorApi, callRefactorSqlQueryApi } = require('../utility/authProxy');
 
 const logger = getLogger('databaseConnections');
 
@@ -593,4 +593,18 @@ module.exports = {
 
     return res;
   },
+
+  refactorSqlQuery_meta: true,
+  async refactorSqlQuery({ conid, database, query, task, dialect }) {
+    const existing = this.opened.find(x => x.conid == conid && x.database == database);
+    const { structure } = existing || {};
+    if (!structure) return { errorMessage: 'No database structure' };
+    const res = await callRefactorSqlQueryApi(query, task, structure, dialect);
+
+    if (!res?.sql) {
+      return { errorMessage: 'No SQL generated' };
+    }
+
+    return res;
+  },
 };
diff --git a/packages/api/src/utility/authProxy.js b/packages/api/src/utility/authProxy.js
index f6122c916..0d998fec2 100644
--- a/packages/api/src/utility/authProxy.js
+++ b/packages/api/src/utility/authProxy.js
@@ -32,6 +32,10 @@ async function callCompleteOnCursorApi(cursorId, query, position, dialect) {
   return null;
 }
 
+async function callRefactorSqlQueryApi(query, task, structure, dialect) {
+  return null;
+}
+
 module.exports = {
   isAuthProxySupported,
   authProxyGetRedirectUrl,
@@ -42,4 +46,5 @@ module.exports = {
   getAwsIamToken,
   callTextToSqlApi,
   callCompleteOnCursorApi,
+  callRefactorSqlQueryApi,
 };
diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index c6f920531..9992e3fc8 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -526,6 +526,16 @@
           editor.session.insert(editor.getCursorPosition(), text);
           domEditor?.getEditor()?.focus();
         }}
+        getTextOrSelectedText={() => domEditor.getEditor().getSelectedText() || $editorValue}
+        onSetSelectedText={text => {
+          const editor = domEditor.getEditor();
+          if (editor.getSelectedText()) {
+            const range = editor.selection.getRange();
+            editor.session.replace(range, text);
+          } else {
+            editor.setValue(text);
+          }
+        }}
       />
     </svelte:fragment>
   </HorizontalSplitter>

From f6b52592fd572f6e61cf59dfd4ccc39a9e4e27ba Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Mon, 10 Feb 2025 12:44:29 +0100
Subject: [PATCH 14/17] ask for send data

---
 packages/web/src/settings/SettingsModal.svelte | 8 ++++++++
 packages/web/src/stores.ts                     | 1 +
 2 files changed, 9 insertions(+)

diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte
index 5cff81e87..e24e31805 100644
--- a/packages/web/src/settings/SettingsModal.svelte
+++ b/packages/web/src/settings/SettingsModal.svelte
@@ -410,6 +410,14 @@ ORDER BY
               { value: 'download', label: 'Check and download new versions' },
             ]}
           />
+
+          {#if isProApp()}
+            <FormCheckboxField
+              name="ai.allowSendModels"
+              label="Allow to send DB models and query snippets to AI service"
+              defaultValue={false}
+            />
+          {/if}
         </svelte:fragment>
 
         <svelte:fragment slot="7">
diff --git a/packages/web/src/stores.ts b/packages/web/src/stores.ts
index 2ab628c22..e49b4d394 100644
--- a/packages/web/src/stores.ts
+++ b/packages/web/src/stores.ts
@@ -115,6 +115,7 @@ export const currentEditorFontSize = getElectron()
   ? writableSettingsValue(null, 'currentEditorFontSize')
   : writableWithStorage(null, 'currentEditorFontSize');
 export const currentEditorFont = writableSettingsValue(null, 'editor.fontFamily');
+export const allowedSendToAiService = writableSettingsValue(false, 'ai.allowSendModels');
 export const activeTabId = derived([openedTabs], ([$openedTabs]) => $openedTabs.find(x => x.selected)?.tabid);
 export const activeTab = derived([openedTabs], ([$openedTabs]) => $openedTabs.find(x => x.selected));
 export const recentDatabases = writableWithStorage([], 'recentDatabases');

From 1e05b0a6596a799913ebdd06cbf7ac1251390971 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Mon, 10 Feb 2025 12:58:30 +0100
Subject: [PATCH 15/17] save ai assistant state

---
 packages/web/src/tabs/QueryTab.svelte | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index 9992e3fc8..608244df6 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -149,7 +149,7 @@
   let domEditor;
   let domToolStrip;
   let intervalId;
-  let isAiAssistantVisible = false;
+  let isAiAssistantVisible = localStorage.getItem(`tabdata_isAiAssistantVisible_${tabid}`) == 'true';
 
   onMount(() => {
     intervalId = setInterval(() => {
@@ -438,6 +438,8 @@
     localStorage.getItem(`tabdata_queryParamStyle_${tabid}`) ??
     initialArgs?.queryParameterStyle ??
     (initialArgs?.scriptTemplate == 'CALL OBJECT' ? ':' : '');
+
+  $: localStorage.setItem(`tabdata_isAiAssistantVisible_${tabid}`, isAiAssistantVisible ? 'true' : 'false');
 </script>
 
 <ToolStripContainer bind:this={domToolStrip}>

From 5205839e18a521f51a100a687fb81ff46fcf6313 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Mon, 10 Feb 2025 14:17:22 +0100
Subject: [PATCH 16/17] AI assistant e2e test

---
 e2e-tests/cypress/e2e/browse-data.cy.js          | 13 +++++++++++++
 .../buttons/ToolStripCommandSplitButton.svelte   |  1 +
 .../web/src/buttons/ToolStripSplitButton.svelte  |  2 +-
 .../buttons/ToolStripSplitDropDownButton.svelte  |  2 +-
 packages/web/src/modals/ConfirmModal.svelte      |  8 +++++++-
 packages/web/src/tabs/QueryTab.svelte            | 16 +++++++++++++---
 6 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/e2e-tests/cypress/e2e/browse-data.cy.js b/e2e-tests/cypress/e2e/browse-data.cy.js
index 51a0127cb..b1dd797ef 100644
--- a/e2e-tests/cypress/e2e/browse-data.cy.js
+++ b/e2e-tests/cypress/e2e/browse-data.cy.js
@@ -349,4 +349,17 @@ describe('Data browser data', () => {
     cy.testid('CompareModelTab_tabOperations').click();
     cy.themeshot('comparesettings');
   });
+
+  it.only('Query editor - AI assistant', () => {
+    cy.contains('MySql-connection').click();
+    cy.contains('MyChinook').click();
+    cy.testid('TabsPanel_buttonNewQuery').click();
+    cy.testid('QueryTab_switchAiAssistantButton').click();
+    cy.testid('QueryAiAssistant_promptInput').type('album names');
+    cy.testid('QueryAiAssistant_queryFromQuestionButton').click();
+    cy.contains('Use this').click();
+    cy.testid('QueryTab_executeButton').click();
+    cy.contains('Balls to the Wall');
+    cy.themeshot('aiassistant');
+  });
 });
diff --git a/packages/web/src/buttons/ToolStripCommandSplitButton.svelte b/packages/web/src/buttons/ToolStripCommandSplitButton.svelte
index 933b5fe51..0373bb8cc 100644
--- a/packages/web/src/buttons/ToolStripCommandSplitButton.svelte
+++ b/packages/web/src/buttons/ToolStripCommandSplitButton.svelte
@@ -17,4 +17,5 @@
   {menu}
   {hideDisabled}
   {buttonLabel}
+  {...$$restProps}
 />
diff --git a/packages/web/src/buttons/ToolStripSplitButton.svelte b/packages/web/src/buttons/ToolStripSplitButton.svelte
index 007ca44cd..a21253c85 100644
--- a/packages/web/src/buttons/ToolStripSplitButton.svelte
+++ b/packages/web/src/buttons/ToolStripSplitButton.svelte
@@ -21,7 +21,7 @@
 
 <div class="button" class:disabled {title}>
   <div class="inner" class:disabled>
-    <div class="main" class:disabled on:click={handleClick}>
+    <div class="main" class:disabled on:click={handleClick} data-testid={$$props['data-testid']}>
       <span class="icon" class:disabled><FontIcon {icon} /></span>
       <slot />
     </div>
diff --git a/packages/web/src/buttons/ToolStripSplitDropDownButton.svelte b/packages/web/src/buttons/ToolStripSplitDropDownButton.svelte
index ffec46466..5236004f7 100644
--- a/packages/web/src/buttons/ToolStripSplitDropDownButton.svelte
+++ b/packages/web/src/buttons/ToolStripSplitDropDownButton.svelte
@@ -19,6 +19,6 @@
   }
 </script>
 
-<ToolStripSplitButton {title} {icon} {disabled} on:splitclick={handleClick} on:click>
+<ToolStripSplitButton {title} {icon} {disabled} on:splitclick={handleClick} on:click {...$$restProps}>
   <slot />
 </ToolStripSplitButton>
diff --git a/packages/web/src/modals/ConfirmModal.svelte b/packages/web/src/modals/ConfirmModal.svelte
index 56cafc438..dceb19281 100644
--- a/packages/web/src/modals/ConfirmModal.svelte
+++ b/packages/web/src/modals/ConfirmModal.svelte
@@ -21,8 +21,14 @@
           closeCurrentModal();
           onConfirm();
         }}
+        data-testid="ConfirmModal_okButton"
+      />
+      <FormStyledButton
+        type="button"
+        value="Close"
+        on:click={closeCurrentModal}
+        data-testid="ConfirmModal_closeButton"
       />
-      <FormStyledButton type="button" value="Close" on:click={closeCurrentModal} />
     </svelte:fragment>
   </ModalBase>
 </FormProvider>
diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index 608244df6..9113ccd5c 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -538,12 +538,16 @@
             editor.setValue(text);
           }
         }}
+        {tabid}
       />
     </svelte:fragment>
   </HorizontalSplitter>
   <svelte:fragment slot="toolstrip">
-    <ToolStripCommandSplitButton commands={['query.execute', 'query.executeCurrent']} />
-    <ToolStripCommandButton command="query.kill" />
+    <ToolStripCommandSplitButton
+      commands={['query.execute', 'query.executeCurrent']}
+      data-testid="QueryTab_executeButton"
+    />
+    <ToolStripCommandButton command="query.kill" data-testid="QueryTab_killButton" />
     <ToolStripSaveButton idPrefix="query" />
     <ToolStripCommandButton command="query.formatCode" />
     {#if resultCount == 1}
@@ -562,7 +566,13 @@
       icon="icon at"
       title="Query parameter style"
     />
-    <ToolStripCommandButton command="query.switchAiAssistant" hideDisabled />
+    <ToolStripCommandButton
+      command="query.switchAiAssistant"
+      hideDisabled
+      data-testid="QueryTab_switchAiAssistantButton"
+    >
+      AI Assistant
+    </ToolStripCommandButton>
   </svelte:fragment>
 </ToolStripContainer>
 

From cf4cc37f668d3884965e2a7d38c3a5902c95c75c Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Mon, 10 Feb 2025 14:18:27 +0100
Subject: [PATCH 17/17] pro ref

---
 .github/workflows/build-app-pro-beta.yaml | 2 +-
 .github/workflows/build-app-pro.yaml      | 2 +-
 .github/workflows/build-aws-pro.yaml      | 2 +-
 .github/workflows/build-docker-pro.yaml   | 2 +-
 .github/workflows/build-npm-pro.yaml      | 2 +-
 .github/workflows/e2e-pro.yaml            | 2 +-
 workflow-templates/includes.tpl.yaml      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-app-pro-beta.yaml b/.github/workflows/build-app-pro-beta.yaml
index 0379a00fc..733dc36dd 100644
--- a/.github/workflows/build-app-pro-beta.yaml
+++ b/.github/workflows/build-app-pro-beta.yaml
@@ -39,7 +39,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: a770b7e7a4d0ced5f1ade7cba4ba516220765648
+          ref: a2f824dc711b510a5e8235d3faf4aafab1965184
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro
diff --git a/.github/workflows/build-app-pro.yaml b/.github/workflows/build-app-pro.yaml
index bf7615383..3ab892a19 100644
--- a/.github/workflows/build-app-pro.yaml
+++ b/.github/workflows/build-app-pro.yaml
@@ -39,7 +39,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: a770b7e7a4d0ced5f1ade7cba4ba516220765648
+          ref: a2f824dc711b510a5e8235d3faf4aafab1965184
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro
diff --git a/.github/workflows/build-aws-pro.yaml b/.github/workflows/build-aws-pro.yaml
index cecc55926..52fa8f321 100644
--- a/.github/workflows/build-aws-pro.yaml
+++ b/.github/workflows/build-aws-pro.yaml
@@ -36,7 +36,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: a770b7e7a4d0ced5f1ade7cba4ba516220765648
+          ref: a2f824dc711b510a5e8235d3faf4aafab1965184
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro
diff --git a/.github/workflows/build-docker-pro.yaml b/.github/workflows/build-docker-pro.yaml
index b650bde46..1da09a70a 100644
--- a/.github/workflows/build-docker-pro.yaml
+++ b/.github/workflows/build-docker-pro.yaml
@@ -44,7 +44,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: a770b7e7a4d0ced5f1ade7cba4ba516220765648
+          ref: a2f824dc711b510a5e8235d3faf4aafab1965184
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro
diff --git a/.github/workflows/build-npm-pro.yaml b/.github/workflows/build-npm-pro.yaml
index cb378c1d1..fc876f443 100644
--- a/.github/workflows/build-npm-pro.yaml
+++ b/.github/workflows/build-npm-pro.yaml
@@ -32,7 +32,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: a770b7e7a4d0ced5f1ade7cba4ba516220765648
+          ref: a2f824dc711b510a5e8235d3faf4aafab1965184
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro
diff --git a/.github/workflows/e2e-pro.yaml b/.github/workflows/e2e-pro.yaml
index 0edb18b8b..9e3378751 100644
--- a/.github/workflows/e2e-pro.yaml
+++ b/.github/workflows/e2e-pro.yaml
@@ -26,7 +26,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: a770b7e7a4d0ced5f1ade7cba4ba516220765648
+          ref: a2f824dc711b510a5e8235d3faf4aafab1965184
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro
diff --git a/workflow-templates/includes.tpl.yaml b/workflow-templates/includes.tpl.yaml
index 53c723ce9..e3fe63593 100644
--- a/workflow-templates/includes.tpl.yaml
+++ b/workflow-templates/includes.tpl.yaml
@@ -7,7 +7,7 @@ checkout-and-merge-pro:
       repository: dbgate/dbgate-pro
       token: ${{ secrets.GH_TOKEN }}
       path: dbgate-pro
-      ref: a770b7e7a4d0ced5f1ade7cba4ba516220765648
+      ref: a2f824dc711b510a5e8235d3faf4aafab1965184
   - name: Merge dbgate/dbgate-pro
     run: |
       mkdir ../dbgate-pro