From 05bf47cb2df27096d96028467277bc3f613fe8ff Mon Sep 17 00:00:00 2001
From: Prem Palanisamy <i.prem.tsd@gmail.com>
Date: Thu, 23 Apr 2026 08:59:50 +0100
Subject: [PATCH] Reapply "fix: gate documentsdb/vectorsdb list calls behind
 multi-db flag"

This reverts commit 2ba0bcc8a35e7f7fc78b2ec168a43702723fcb76.
---
 .../(entity)/helpers/sdk.ts                   | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/sdk.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/sdk.ts
index 260b3b4ac..a9090f3fd 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/sdk.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/sdk.ts
@@ -1,4 +1,8 @@
 import { sdk } from '$lib/stores/sdk';
+import { flags } from '$lib/flags';
+import { user } from '$lib/stores/user';
+import { organization } from '$lib/stores/organization';
+import { get } from 'svelte/store';
 import type { Page } from '@sveltejs/kit';
 import type { TerminologyResult } from './types';
 import {
@@ -173,11 +177,17 @@ export function useDatabaseSdk(
         },
 
         async list(params): Promise<Models.DatabaseList> {
-            const results = await Promise.all([
-                baseSdk.tablesDB.list(params),
-                baseSdk.documentsDB.list(params),
-                baseSdk.vectorsDB.list(params)
-            ]);
+            const isMultiDb = flags.multiDb({
+                account: get(user),
+                organization: get(organization)
+            });
+
+            const calls: Array<Promise<Models.DatabaseList>> = [baseSdk.tablesDB.list(params)];
+            if (isMultiDb) {
+                calls.push(baseSdk.documentsDB.list(params), baseSdk.vectorsDB.list(params));
+            }
+
+            const results = await Promise.all(calls);
 
             return results.reduce(
                 (acc, curr) => ({