duckDb: singleConnection query

packages/types/engines.d.ts

@@ -310,6 +310,7 @@ export interface EngineDriver<TClient = any> extends FilterBehaviourProvider {
 
   analyserClass?: any;
   dumperClass?: any;
+  singleConnectionOnly?: boolean;
 }
 
 export interface DatabaseModification {

packages/web/src/query/SimpleQueryResultTabs.svelte

@@ -0,0 +1,52 @@
+<script lang="ts">
+  import { createGridCache, createGridConfig, FreeTableGridDisplay } from 'dbgate-datalib';
+  import DataGridCore from '../datagrid/DataGridCore.svelte';
+  import RowsArrayGrider from '../datagrid/RowsArrayGrider';
+  import TabControl from '../elements/TabControl.svelte';
+  import { TableInfo } from 'dbgate-types';
+  import { writable } from 'svelte/store';
+  import DataGrid from '../datagrid/DataGrid.svelte';
+  import ErrorInfo from '../elements/ErrorInfo.svelte';
+
+  let selectedTab = 0;
+
+  export let result;
+
+  const config = writable(createGridConfig());
+  const cache = writable(createGridCache());
+
+  $: grider = result?.rows && result?.columns ? new RowsArrayGrider(result.rows) : null;
+  $: display =
+    result?.rows && result?.columns
+      ? new FreeTableGridDisplay(
+          {
+            structure: {
+              columns: result.columns,
+            } as TableInfo,
+            rows: result.rows,
+          },
+          $config,
+          config.update,
+          $cache,
+          cache.update
+        )
+      : null;
+</script>
+
+<TabControl
+  bind:value={selectedTab}
+  tabs={[grider && display && { label: 'Data', slot: 1 }, { label: 'Status', slot: 2 }]}
+>
+  <svelte:fragment slot="1">
+    {#if grider && display}
+      <DataGrid {grider} {display} gridCoreComponent={DataGridCore} />
+    {/if}
+  </svelte:fragment>
+  <svelte:fragment slot="2">
+    {#if result?.errorMessage}
+      <ErrorInfo message={result?.errorMessage} alignTop />
+    {:else if result?.rows}
+      <ErrorInfo message={`Returned ${result.rows.length} rows`} icon="img info" alignTop />
+    {/if}
+  </svelte:fragment>
+</TabControl>

packages/web/src/tabs/QueryTab.svelte

@@ -143,6 +143,7 @@
   import { isProApp } from '../utility/proTools';
   import HorizontalSplitter from '../elements/HorizontalSplitter.svelte';
   import QueryAiAssistant from '../query/QueryAiAssistant.svelte';
+  import SimpleQueryResultTabs from '../query/SimpleQueryResultTabs.svelte';
 
   export let tabid;
   export let conid;
@@ -196,6 +197,8 @@
   let isInTransaction = false;
   let isAutocommit = false;
 
+  let simpleQueryDataResult = null;
+
   onMount(() => {
     intervalId = setInterval(() => {
       if (sessionId) {
@@ -323,6 +326,16 @@
       return;
     }
 
+    if (driver?.singleConnectionOnly) {
+      simpleQueryDataResult = await apiCall('database-connections/query-data', {
+        conid,
+        database,
+        sql,
+      });
+      visibleResultTabs = true;
+      return;
+    }
+
     executeStartLine = startLine;
     executeNumber++;
     visibleResultTabs = true;
@@ -642,19 +655,23 @@
           {/if}
         </svelte:fragment>
         <svelte:fragment slot="2">
-          <ResultTabs tabs={[{ label: 'Messages', slot: 0 }]} {sessionId} {executeNumber} bind:resultCount {driver}>
+          {#if driver?.singleConnectionOnly}
-            <svelte:fragment slot="0">
+            <SimpleQueryResultTabs result={simpleQueryDataResult} />
-              <SocketMessageView
+          {:else}
-                eventName={sessionId ? `session-info-${sessionId}` : null}
+            <ResultTabs tabs={[{ label: 'Messages', slot: 0 }]} {sessionId} {executeNumber} bind:resultCount {driver}>
-                onMessageClick={handleMesageClick}
+              <svelte:fragment slot="0">
-                {executeNumber}
+                <SocketMessageView
-                startLine={executeStartLine}
+                  eventName={sessionId ? `session-info-${sessionId}` : null}
-                showProcedure
+                  onMessageClick={handleMesageClick}
-                showLine
+                  {executeNumber}
-                onChangeErrors={handleChangeErrors}
+                  startLine={executeStartLine}
-              />
+                  showProcedure
-            </svelte:fragment>
+                  showLine
-          </ResultTabs>
+                  onChangeErrors={handleChangeErrors}
+                />
+              </svelte:fragment>
+            </ResultTabs>
+          {/if}
         </svelte:fragment>
       </VerticalSplitter>
     </svelte:fragment>

plugins/dbgate-plugin-duckdb/src/frontend/driver.js

@@ -53,6 +53,7 @@ const driver = {
   title: 'DuckDB',
   readOnlySessions: true,
   supportsTransactions: true,
+  singleConnectionOnly: true,
 
   getQuerySplitterOptions: (usage) =>
     usage == 'editor'