Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor: batch request (#18587)

ecmadao566ca1698836
diff --git a/backend/api/v1/database_group_service.go b/backend/api/v1/database_group_service.go
index 7d3c1f5e09..c8cc4b7d2d 100644
--- a/backend/api/v1/database_group_service.go
+++ b/backend/api/v1/database_group_service.go
@@ -79,7 +79,7 @@ func (s *DatabaseGroupService) CreateDatabaseGroup(ctx context.Context, req *con
Expression: req.Msg.DatabaseGroup.DatabaseExpr,
}
if req.Msg.ValidateOnly {
- result, err := convertStoreToV1DatabaseGroup(ctx, s.store, storeDatabaseGroup, projectResourceID, v1pb.DatabaseGroupView_DATABASE_GROUP_VIEW_FULL)
+ result, err := convertStoreToV1DatabaseGroupWithView(ctx, s.store, storeDatabaseGroup, projectResourceID, v1pb.DatabaseGroupView_DATABASE_GROUP_VIEW_FULL)
if err != nil {
return nil, err
}
@@ -90,7 +90,7 @@ func (s *DatabaseGroupService) CreateDatabaseGroup(ctx context.Context, req *con
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
- result, err := convertStoreToV1DatabaseGroup(ctx, s.store, databaseGroup, projectResourceID, v1pb.DatabaseGroupView_DATABASE_GROUP_VIEW_FULL)
+ result, err := convertStoreToV1DatabaseGroupWithView(ctx, s.store, databaseGroup, projectResourceID, v1pb.DatabaseGroupView_DATABASE_GROUP_VIEW_FULL)
if err != nil {
return nil, err
}
@@ -161,7 +161,7 @@ func (s *DatabaseGroupService) UpdateDatabaseGroup(ctx context.Context, req *con
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
- result, err := convertStoreToV1DatabaseGroup(ctx, s.store, databaseGroup, projectResourceID, v1pb.DatabaseGroupView_DATABASE_GROUP_VIEW_FULL)
+ result, err := convertStoreToV1DatabaseGroupWithView(ctx, s.store, databaseGroup, projectResourceID, v1pb.DatabaseGroupView_DATABASE_GROUP_VIEW_FULL)
if err != nil {
return nil, err
}
@@ -228,9 +228,17 @@ func (s *DatabaseGroupService) ListDatabaseGroups(ctx context.Context, req *conn
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to list database groups"))
}
+ var allProjectDatabases []*store.DatabaseMessage
+ if req.Msg.View == v1pb.DatabaseGroupView_DATABASE_GROUP_VIEW_FULL {
+ allProjectDatabases, err = s.store.ListDatabases(ctx, &store.FindDatabaseMessage{ProjectID: &projectResourceID})
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, err)
+ }
+ }
+
var apiDatabaseGroups []*v1pb.DatabaseGroup
for _, databaseGroup := range databaseGroups {
- group, err := convertStoreToV1DatabaseGroup(ctx, s.store, databaseGroup, projectResourceID, req.Msg.View)
+ group, err := convertStoreToV1DatabaseGroup(ctx, databaseGroup, projectResourceID, allProjectDatabases)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert database group %q", databaseGroup.ResourceID))
}
@@ -274,29 +282,37 @@ func getDatabaseGroupByName(ctx context.Context, stores *store.Store, databaseGr
if databaseGroup == nil {
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database group %q not found", databaseGroupResourceID))
}
- return convertStoreToV1DatabaseGroup(ctx, stores, databaseGroup, projectResourceID, view)
+ return convertStoreToV1DatabaseGroupWithView(ctx, stores, databaseGroup, projectResourceID, view)
}
-func convertStoreToV1DatabaseGroup(ctx context.Context, stores *store.Store, databaseGroup *store.DatabaseGroupMessage, projectResourceID string, view v1pb.DatabaseGroupView) (*v1pb.DatabaseGroup, error) {
+func convertStoreToV1DatabaseGroupWithView(ctx context.Context, stores *store.Store, databaseGroup *store.DatabaseGroupMessage, projectResourceID string, view v1pb.DatabaseGroupView) (*v1pb.DatabaseGroup, error) {
+ var allProjectDatabases []*store.DatabaseMessage
+ if view == v1pb.DatabaseGroupView_DATABASE_GROUP_VIEW_FULL {
+ databases, err := stores.ListDatabases(ctx, &store.FindDatabaseMessage{ProjectID: &projectResourceID})
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, err)
+ }
+ allProjectDatabases = databases
+ }
+
+ return convertStoreToV1DatabaseGroup(ctx, databaseGroup, projectResourceID, allProjectDatabases)
+}
+
+func convertStoreToV1DatabaseGroup(
+ ctx context.Context,
+ databaseGroup *store.DatabaseGroupMessage,
+ projectResourceID string,
+ databases []*store.DatabaseMessage,
+) (*v1pb.DatabaseGroup, error) {
ret := &v1pb.DatabaseGroup{
Name: fmt.Sprintf("%s/%s%s", common.FormatProject(projectResourceID), common.DatabaseGroupNamePrefix, databaseGroup.ResourceID),
Title: databaseGroup.Title,
DatabaseExpr: databaseGroup.Expression,
}
- if view == v1pb.DatabaseGroupView_DATABASE_GROUP_VIEW_BASIC || view == v1pb.DatabaseGroupView_DATABASE_GROUP_VIEW_UNSPECIFIED {
- return ret, nil
- }
-
- databases, err := stores.ListDatabases(ctx, &store.FindDatabaseMessage{
- ProjectID: &projectResourceID,
- })
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, err)
- }
matches, err := utils.GetMatchedDatabasesInDatabaseGroup(ctx, databaseGroup, databases)
if err != nil {
- return nil, err
+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get matched databases for group %v with error: %v", ret.Name, err.Error()))
}
for _, database := range matches {
ret.MatchedDatabases = append(ret.MatchedDatabases, &v1pb.DatabaseGroup_Database{
diff --git a/frontend/src/components/DataExportButton.vue b/frontend/src/components/DataExportButton.vue
index 8e8b650ab4..74aad417d0 100644
--- a/frontend/src/components/DataExportButton.vue
+++ b/frontend/src/components/DataExportButton.vue
@@ -381,10 +381,13 @@ const doDownload = async (content: DownloadContent[], format: ExportFormat) => {
}
const zip = new JSZip();
- for (const c of content) {
- const blob = await convertSingleFile(c, format);
- zip.file(c.filename, blob);
- }
+
+ await Promise.all(
+ content.map(async (c) => {
+ const blob = await convertSingleFile(c, format);
+ zip.file(c.filename, blob);
+ })
+ );
const zipFile = await zip.generateAsync({ type: "blob" });
const fileName = `download_${dayjs().format("YYYY-MM-DDTHH-mm-ss")}.zip`;
diff --git a/frontend/src/components/GrantRequestPanel/GrantRequestPanel.vue b/frontend/src/components/GrantRequestPanel/GrantRequestPanel.vue
index 35f66eda2c..ab8bc7efe1 100644
--- a/frontend/src/components/GrantRequestPanel/GrantRequestPanel.vue
+++ b/frontend/src/components/GrantRequestPanel/GrantRequestPanel.vue
@@ -83,7 +83,6 @@ const props = withDefaults(
databaseResources: () => [],
role: undefined,
placement: "right",
- supportRoles: () => [],
}
);
diff --git a/frontend/src/components/Member/utils.ts b/frontend/src/components/Member/utils.ts
index 2e215b035b..ea74a34b03 100644
--- a/frontend/src/components/Member/utils.ts
+++ b/frontend/src/components/Member/utils.ts
@@ -14,30 +14,25 @@ import {
import { State } from "@/types/proto-es/v1/common_pb";
import { GroupSchema } from "@/types/proto-es/v1/group_service_pb";
import type { IamPolicy } from "@/types/proto-es/v1/iam_policy_pb";
-import type { User } from "@/types/proto-es/v1/user_service_pb";
import { UserSchema, UserType } from "@/types/proto-es/v1/user_service_pb";
import type { GroupBinding, MemberBinding } from "./types";
-const getMemberBinding = async (
+const getMemberBinding = (
member: string,
searchText: string
-): Promise<MemberBinding | undefined> => {
+): MemberBinding | undefined => {
const groupStore = useGroupStore();
const userStore = useUserStore();
let memberBinding: MemberBinding | undefined = undefined;
if (member.startsWith(groupBindingPrefix)) {
+ const g = groupStore.getGroupByIdentifier(member);
let group: GroupBinding | undefined;
- try {
- const g = await groupStore.getOrFetchGroupByIdentifier(member);
- if (g) {
- group = {
- ...g,
- deleted: false,
- };
- }
- } catch {
- // nothing
+ if (g) {
+ group = {
+ ...g,
+ deleted: false,
+ };
}
if (!group) {
const email = extractGroupEmail(member);
@@ -59,17 +54,11 @@ const getMemberBinding = async (
projectRoleBindings: [],
};
} else {
- let user: User | undefined;
- try {
- user = await userStore.getOrFetchUserByIdentifier(member);
- } catch {
- // nothing
- }
-
+ let user = userStore.getUserByIdentifier(member);
if (!user) {
const email = extractUserId(member);
user = create(UserSchema, {
- title: member,
+ title: email,
name: `${userNamePrefix}${email}`,
email: email,
userType: UserType.USER,
@@ -98,7 +87,7 @@ const getMemberBinding = async (
return memberBinding;
};
-export const getMemberBindings = async ({
+export const getMemberBindings = ({
policies,
searchText,
ignoreRoles,
@@ -106,23 +95,10 @@ export const getMemberBindings = async ({
policies: { level: "WORKSPACE" | "PROJECT"; policy: IamPolicy }[];
searchText: string;
ignoreRoles: Set<string>;
-}): Promise<MemberBinding[]> => {
+}): MemberBinding[] => {
const memberMap = new Map<string, MemberBinding>();
const search = searchText.trim().toLowerCase();
- const ensureMemberBinding = async (member: string) => {
- if (!memberMap.has(member)) {
- try {
- const memberBinding = await getMemberBinding(member, search);
- if (!memberBinding) {
- return undefined;
- }
- memberMap.set(member, memberBinding);
- } catch {}
- }
- return memberMap.get(member);
- };
-
for (const policy of policies) {
for (const binding of policy.policy.bindings) {
if (ignoreRoles.has(binding.role)) {
@@ -130,7 +106,13 @@ export const getMemberBindings = async ({
}
for (const member of binding.members) {
- const memberBinding = await ensureMemberBinding(member);
+ if (!memberMap.has(member)) {
+ const memberBinding = getMemberBinding(member, search);
+ if (memberBinding) {
+ memberMap.set(member, memberBinding);
+ }
+ }
+ const memberBinding = memberMap.get(member);
if (!memberBinding) {
continue;
}
diff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vue
index 1e26f7cdf3..f45aa45aca 100644
--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vue
+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vue
@@ -92,7 +92,11 @@ import type {
} from "@/types/proto-es/v1/issue_service_pb";
import { Issue_Approver_Status } from "@/types/proto-es/v1/issue_service_pb";
import type { User as UserType } from "@/types/proto-es/v1/user_service_pb";
-import { isBindingPolicyExpired, memberMapToRolesInProjectIAM } from "@/utils";
+import {
+ ensureUserFullName,
+ isBindingPolicyExpired,
+ memberMapToRolesInProjectIAM,
+} from "@/utils";
import ApprovalUserView from "./ApprovalUserView.vue";
import PotentialApprovers from "./PotentialApprovers.vue";
@@ -279,8 +283,11 @@ const potentialApprovers = computedAsync(async () => {
}
const users: UserType[] = [];
+ await userStore.batchGetUsers(
+ filteredCandidateEmails.value.map(ensureUserFullName)
+ );
for (const email of filteredCandidateEmails.value) {
- const user = await userStore.getOrFetchUserByIdentifier(email);
+ const user = userStore.getUserByIdentifier(email);
if (user && user.state === State.ACTIVE) {
users.push(user);
}
diff --git a/frontend/src/components/Project/useRecentProjects.ts b/frontend/src/components/Project/useRecentProjects.ts
index e316ad8423..67406289bb 100644
--- a/frontend/src/components/Project/useRecentProjects.ts
+++ b/frontend/src/components/Project/useRecentProjects.ts
@@ -36,12 +36,11 @@ export const useRecentProjects = () => {
const projects = [];
const invalidProjects: string[] = [];
+ await projectV1Store.batchGetProjects(recentViewProjectNames.value);
+
for (const projectName of recentViewProjectNames.value) {
try {
- const project = await projectV1Store.getOrFetchProjectByName(
- projectName,
- true /* silent */
- );
+ const project = projectV1Store.getProjectByName(projectName);
if (
isValidProjectName(project.name) &&
hasProjectPermissionV2(project, "bb.projects.get")
diff --git a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue
index 1aa28fac06..83c3960e0b 100644
--- a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue
+++ b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue
@@ -26,7 +26,7 @@
v-model:value="state.role"
:include-workspace-roles="false"
:suffix="''"
- :support-roles="supportRoles"
+ :filter="filterRole"
/>
</div>
<div class="w-full flex flex-col gap-y-2">
@@ -104,7 +104,6 @@ const props = withDefaults(
{
disableMemberChange: false,
requireReason: false,
- supportRoles: () => [],
databaseResources: () => [],
}
);
@@ -121,6 +120,13 @@ interface LocalState {
databaseId?: string;
}
+const filterRole = (role: string) => {
+ if (!props.supportRoles) {
+ return true;
+ }
+ return props.supportRoles.includes(role);
+};
+
const getInitialState = (): LocalState => {
const defaultState: LocalState = {
role: props.binding.role,
diff --git a/frontend/src/components/ProjectMember/ProjectMemberPanel.vue b/frontend/src/components/ProjectMember/ProjectMemberPanel.vue
index 82c9b9d7bf..648d1b7a50 100644
--- a/frontend/src/components/ProjectMember/ProjectMemberPanel.vue
+++ b/frontend/src/components/ProjectMember/ProjectMemberPanel.vue
@@ -102,7 +102,6 @@
</template>
<script lang="ts" setup>
-import { computedAsync } from "@vueuse/core";
import { cloneDeep } from "lodash-es";
import { NButton, NTabPane, NTabs, useDialog } from "naive-ui";
import { computed, reactive } from "vue";
@@ -196,7 +195,7 @@ const shouldShowRequestRoleButton = computed(() => {
const workspaceRoles = computed(() => new Set(PRESET_WORKSPACE_ROLES));
-const memberBindings = computedAsync(() => {
+const memberBindings = computed(() => {
return getMemberBindings({
policies: [
{
@@ -211,7 +210,7 @@ const memberBindings = computedAsync(() => {
searchText: state.searchText,
ignoreRoles: workspaceRoles.value,
});
-}, []);
+});
const selectMember = (binding: MemberBinding) => {
state.editingMember = binding.binding;
diff --git a/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue b/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue
index c8b1d88ed2..e83e1fba3e 100644
--- a/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue
+++ b/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue
@@ -30,6 +30,7 @@ import {
} from "@/components/v2";
import { WORKSPACE_ROUTE_USER_PROFILE } from "@/router/dashboard/workspaceRoutes";
import {
+ composePolicyBindings,
extractGroupEmail,
pushNotification,
useDatabaseV1Store,
@@ -190,10 +191,10 @@ const getDatabaseAccessResource = (access: AccessUser): VNodeChild => {
const expirationTimeRegex = /request.time < timestamp\("(.+)?"\)/;
-const getAccessUsers = async (
+const getAccessUsers = (
exception: MaskingExemptionPolicy_Exemption,
condition: ConditionExpression
-): Promise<AccessUser[]> => {
+): AccessUser[] => {
let expirationTimestamp: number | undefined;
const expression = exception.condition?.expression ?? "";
const description = exception.condition?.description ?? "";
@@ -217,10 +218,10 @@ const getAccessUsers = async (
if (member.startsWith(groupBindingPrefix)) {
access.type = "group";
- access.group = await groupStore.getOrFetchGroupByIdentifier(member);
+ access.group = groupStore.getGroupByIdentifier(member);
} else {
access.type = "user";
- access.user = await userStore.getOrFetchUserByIdentifier(member);
+ access.user = userStore.getUserByIdentifier(member);
}
if (access.group || access.user) {
@@ -257,11 +258,12 @@ const updateAccessUserList = async () => {
);
const conditionList = await batchConvertFromCELString(expressionList);
+ await composePolicyBindings(exemptions);
for (let i = 0; i < exemptions.length; i++) {
const exception = exemptions[i];
const condition = conditionList[i];
- const items = await getAccessUsers(exception, condition);
+ const items = getAccessUsers(exception, condition);
for (const item of items) {
memberMap.set(item.key, item);
}
diff --git a/frontend/src/components/User/Settings/CreateUserDrawer.vue b/frontend/src/components/User/Settings/CreateUserDrawer.vue
index 7425a8a70f..0f23c0ff60 100644
--- a/frontend/src/components/User/Settings/CreateUserDrawer.vue
+++ b/frontend/src/components/User/Settings/CreateUserDrawer.vue
@@ -348,7 +348,7 @@ import {
useUserStore,
useWorkspaceV1Store,
} from "@/store";
-import { emptyUser, PresetRoleType } from "@/types";
+import { emptyUser } from "@/types";
import type { User } from "@/types/proto-es/v1/user_service_pb";
import {
UserSchema,
@@ -394,7 +394,7 @@ const userPasswordRef = ref<InstanceType<typeof UserPassword>>();
const state = reactive<LocalState>({
isRequesting: false,
user: emptyUser(),
- roles: [PresetRoleType.WORKSPACE_MEMBER],
+ roles: [],
passwordConfirm: "",
wif: {
emailPrefix: "",
diff --git a/frontend/src/components/v2/Select/RoleSelect.vue b/frontend/src/components/v2/Select/RoleSelect.vue
index 21b1d68511..80a80cdab4 100644
--- a/frontend/src/components/v2/Select/RoleSelect.vue
+++ b/frontend/src/components/v2/Select/RoleSelect.vue
@@ -44,7 +44,7 @@ const props = withDefaults(
multiple?: boolean;
suffix?: string;
includeWorkspaceRoles?: boolean;
- supportRoles?: string[];
+ filter?: (role: string) => boolean;
}>(),
{
clearable: true,
@@ -53,7 +53,6 @@ const props = withDefaults(
` (${t("common.optional")}, ${t(
"role.project-roles.apply-to-all-projects"
).toLocaleLowerCase()})`,
- supportRoles: () => [],
}
);
@@ -66,10 +65,10 @@ const showFeatureModal = ref(false);
const hasCustomRoleFeature = featureToRef(PlanFeature.FEATURE_CUSTOM_ROLES);
const filterRole = (role: string) => {
- if (!props.supportRoles || props.supportRoles.length === 0) {
+ if (!props.filter) {
return true;
}
- return props.supportRoles.includes(role);
+ return props.filter(role);
};
const availableRoleOptions = computed(
diff --git a/frontend/src/store/modules/v1/projectIamPolicy.ts b/frontend/src/store/modules/v1/projectIamPolicy.ts
index 88c23fb318..ca2a872ba3 100644
--- a/frontend/src/store/modules/v1/projectIamPolicy.ts
+++ b/frontend/src/store/modules/v1/projectIamPolicy.ts
@@ -6,6 +6,7 @@ import { projectServiceClientConnect } from "@/grpcweb";
import {
ALL_USERS_USER_EMAIL,
type ComposedDatabase,
+ groupBindingPrefix,
type MaybeRef,
type QueryPermission,
QueryPermissionQueryAny,
@@ -25,24 +26,37 @@ import { convertFromExpr } from "@/utils/issue/cel";
import { useRoleStore } from "../role";
import { useUserStore } from "../user";
import { useCurrentUserV1 } from "./auth";
+import { useGroupStore } from "./group";
import { usePermissionStore } from "./permission";
+export const composePolicyBindings = async (
+ bindings: { members: string[] }[]
+) => {
+ const users: string[] = [];
+ const groups: string[] = [];
+ for (const binding of bindings) {
+ for (const member of binding.members) {
+ if (member.startsWith(groupBindingPrefix)) {
+ groups.push(member);
+ } else {
+ users.push(member);
+ }
+ }
+ }
+ await Promise.all([
+ useUserStore().batchGetUsers(users),
+ useGroupStore().batchFetchGroups(groups),
+ ]);
+};
+
export const useProjectIamPolicyStore = defineStore(
"project-iam-policy",
() => {
const policyMap = ref(new Map<string, IamPolicy>());
const requestCache = new Map<string, Promise<IamPolicy>>();
- const composeProjectPolicy = async (policy: IamPolicy) => {
- const members = policy.bindings.reduce((list, binding) => {
- list.push(...binding.members);
- return list;
- }, [] as string[]);
- await useUserStore().batchGetUsers(members);
- };
-
const setIamPolicy = async (project: string, policy: IamPolicy) => {
- await composeProjectPolicy(policy);
+ await composePolicyBindings(policy.bindings);
policyMap.value.set(project, policy);
return policy;
};
diff --git a/frontend/src/store/modules/v1/workspace.ts b/frontend/src/store/modules/v1/workspace.ts
index 32794f641f..b345e94178 100644
--- a/frontend/src/store/modules/v1/workspace.ts
+++ b/frontend/src/store/modules/v1/workspace.ts
@@ -15,6 +15,7 @@ import {
import { bindingListInIAM, getUserEmailListInBinding } from "@/utils";
import { extractUserId } from "./common";
import { extractGroupEmail } from "./group";
+import { composePolicyBindings } from "./projectIamPolicy";
export const useWorkspaceV1Store = defineStore("workspace_v1", () => {
const _workspaceIamPolicy = ref<IamPolicy>(create(IamPolicySchema, {}));
@@ -65,6 +66,7 @@ export const useWorkspaceV1Store = defineStore("workspace_v1", () => {
resource: "workspaces/-",
});
const policy = await workspaceServiceClientConnect.getIamPolicy(request);
+ await composePolicyBindings(policy.bindings);
_workspaceIamPolicy.value = policy;
return policy;
};
diff --git a/frontend/src/views/SettingWorkspaceMembers.vue b/frontend/src/views/SettingWorkspaceMembers.vue
index e5a29a241c..8b28b70d03 100644
--- a/frontend/src/views/SettingWorkspaceMembers.vue
+++ b/frontend/src/views/SettingWorkspaceMembers.vue
@@ -81,7 +81,6 @@
</template>
<script setup lang="ts">
-import { computedAsync } from "@vueuse/core";
import { NButton, NTabPane, NTabs, useDialog } from "naive-ui";
import { computed, reactive } from "vue";
import { useI18n } from "vue-i18n";
@@ -191,7 +190,7 @@ const revokeMember = async (binding: MemberBinding) => {
});
};
-const memberBindings = computedAsync(() => {
+const memberBindings = computed(() => {
return getMemberBindings({
policies: [
{
@@ -202,5 +201,5 @@ const memberBindings = computedAsync(() => {
searchText: state.searchText,
ignoreRoles: new Set([]),
});
-}, []);
+});
</script>
diff --git a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue
index d77bacb0b0..ad582ddf9e 100644
--- a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue
+++ b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue
@@ -409,10 +409,11 @@ const getQueryableDatabase = async (batchQueryContext: BatchQueryContext) => {
for (const databaseGroupName of batchQueryContext.databaseGroups ?? []) {
const databaseGroup = dbGroupStore.getDBGroupByName(databaseGroupName);
+ await batchGetOrFetchDatabases(
+ databaseGroup.matchedDatabases.map((db) => db.name)
+ );
for (const matchedDatabase of databaseGroup.matchedDatabases) {
- const database = await databaseStore.getOrFetchDatabaseByName(
- matchedDatabase.name
- );
+ const database = databaseStore.getDatabaseByName(matchedDatabase.name);
if (isDatabaseV1Queryable(database)) {
return database;
}