Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Fix QB perf (#79132)

Alexander Polyankine3e3a193f88b
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsPage.unit.spec.tsx
index 905c18ae240..1cd53083911 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsPage.unit.spec.tsx
@@ -138,6 +138,12 @@ const emptyDatasetResponse: Dataset = createMockDataset({
/** Mock the audit-DB metadata, users/groups, and the `/api/dataset` adhoc endpoint (with the given dataset). */
function setupEndpoints(dataset: Dataset = datasetResponse) {
fetchMock.get(`path:/api/database/${AUDIT_DB_ID}/metadata`, auditDatabase);
+ // useAuditTable pulls the table's fields (and its FK targets') from here.
+ fetchMock.post("path:/api/dataset/query_metadata", {
+ databases: [auditDatabase],
+ tables: auditDatabase.tables ?? [],
+ fields: (auditDatabase.tables ?? []).flatMap((table) => table.fields ?? []),
+ });
setupUsersEndpoints([createMockUser({ id: 1, first_name: "Ada" })]);
setupGroupsEndpoint([createMockGroup({ id: 1, name: "All Users" })]);
fetchMock.post("path:/api/dataset", dataset, { name: "dataset" });
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsx
index f9528dada8b..065090a1f08 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsx
@@ -170,6 +170,12 @@ const emptyDatasetResponse: Dataset = createMockDataset({
/** Mock the audit-DB metadata, users/groups, and the `/api/dataset` adhoc endpoint (with the given dataset). */
function setupEndpoints(dataset: Dataset = datasetResponse) {
fetchMock.get(`path:/api/database/${AUDIT_DB_ID}/metadata`, auditDatabase);
+ // useAuditTable pulls the table's fields (and its FK targets') from here.
+ fetchMock.post("path:/api/dataset/query_metadata", {
+ databases: [auditDatabase],
+ tables: auditDatabase.tables ?? [],
+ fields: (auditDatabase.tables ?? []).flatMap((table) => table.fields ?? []),
+ });
setupUsersEndpoints([createMockUser({ id: 1, first_name: "Ada" })]);
setupGroupsEndpoint([createMockGroup({ id: 1, name: "All Users" })]);
fetchMock.post("path:/api/dataset", dataset, { name: "dataset" });
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.unit.spec.tsx
index 0a6dc98a402..e874572b32c 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.unit.spec.tsx
@@ -212,6 +212,12 @@ function setup({
setupEnterprisePlugins();
fetchMock.get(`path:/api/database/${AUDIT_DB_ID}/metadata`, auditDatabase);
+ // useAuditTable pulls the table's fields (and its FK targets') from here.
+ fetchMock.post("path:/api/dataset/query_metadata", {
+ databases: [auditDatabase],
+ tables: auditDatabase.tables ?? [],
+ fields: (auditDatabase.tables ?? []).flatMap((table) => table.fields ?? []),
+ });
fetchMock.post(
"path:/api/dataset",
(call) => buildDatasetResponse(call?.options.body),
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/hooks/useAuditTable.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/hooks/useAuditTable.ts
index 312b5f5ed3a..887915bf76d 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/hooks/useAuditTable.ts
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/hooks/useAuditTable.ts
@@ -1,6 +1,10 @@
import { useMemo } from "react";
-import { useGetDatabaseMetadataQuery } from "metabase/api";
+import {
+ skipToken,
+ useGetAdhocQueryMetadataQuery,
+ useGetDatabaseMetadataQuery,
+} from "metabase/api";
import { useSelector } from "metabase/redux";
import { getMetadataUnfiltered } from "metabase/selectors/metadata";
import type {
@@ -26,27 +30,46 @@ type UseAuditTableResult = {
* (case-insensitive to handle H2 uppercasing).
*/
export function useAuditTable(viewName: string): UseAuditTableResult {
- const { isLoading } = useGetDatabaseMetadataQuery({ id: AUDIT_DB_ID });
+ const { data: database, isLoading: isLoadingTables } =
+ useGetDatabaseMetadataQuery({ id: AUDIT_DB_ID, skip_fields: true });
+
+ const tableId = useMemo(() => {
+ const lowerName = viewName.toLowerCase();
+ const table = database?.tables?.find(
+ (table) => table.name?.toLowerCase() === lowerName,
+ );
+ return typeof table?.id === "number" ? table.id : undefined;
+ }, [database, viewName]);
+
const metadata = useSelector(getMetadataUnfiltered);
- return useMemo(() => {
- if (isLoading) {
- return { provider: null, table: null, isLoading: true };
- }
+ const provider = useMemo(
+ () => Lib.metadataProvider(AUDIT_DB_ID, metadata),
+ [metadata],
+ );
- const lowerName = viewName.toLowerCase();
- const tableId = Object.keys(metadata.tables).find((key) => {
- const t = metadata.tables[key];
- return t.db_id === AUDIT_DB_ID && t.name?.toLowerCase() === lowerName;
- });
+ const table = useMemo(
+ () => (tableId == null ? null : Lib.tableOrCardMetadata(provider, tableId)),
+ [provider, tableId],
+ );
+
+ const datasetQuery = useMemo(
+ () =>
+ table == null
+ ? undefined
+ : Lib.toJsQuery(Lib.queryFromTableOrCardMetadata(provider, table)),
+ [provider, table],
+ );
- if (!tableId) {
- return { provider: null, table: null, isLoading: false };
- }
+ const { data: queryMetadata } = useGetAdhocQueryMetadataQuery(
+ datasetQuery ?? skipToken,
+ );
- const provider = Lib.metadataProvider(AUDIT_DB_ID, metadata);
- const table = Lib.tableOrCardMetadata(provider, Number(tableId));
+ const isLoadingFields = table != null && queryMetadata == null;
- return { provider, table, isLoading: false };
- }, [isLoading, metadata, viewName]);
+ return {
+ provider,
+ table: isLoadingFields ? null : table,
+ isLoading: isLoadingTables || isLoadingFields,
+ };
}
diff --git a/frontend/src/metabase-lib/v1/metadata/Table.ts b/frontend/src/metabase-lib/v1/metadata/Table.ts
index 7a884fc4670..bdcf14b080b 100644
--- a/frontend/src/metabase-lib/v1/metadata/Table.ts
+++ b/frontend/src/metabase-lib/v1/metadata/Table.ts
@@ -47,12 +47,6 @@ class Table {
return this.fields ?? [];
}
- hasSchema() {
- return (
- (this.schema_name && this.db && this.db.getSchemas().length > 1) || false
- );
- }
-
// Could be replaced with hydrated database property in selectors/metadata.js (instead / in addition to `table.db`)
get database() {
return this.db;
@@ -112,18 +106,6 @@ class Table {
return fks.map((fk) => fk.origin?.table).filter((table) => table != null);
}
- foreignTables(): Table[] {
- const fields = this.getFields();
- if (!fields) {
- return [];
- }
- // Unjustified type cast. FIXME
- return fields
- .filter((field) => field.isFK() && field.fk_target_field_id)
- .map((field) => this.metadata?.field(field.fk_target_field_id)?.table)
- .filter(Boolean) as Table[];
- }
-
clone() {
const table = new Table(this.getPlainObject());
Object.assign(table, this);
diff --git a/frontend/src/metabase-types/api/database.ts b/frontend/src/metabase-types/api/database.ts
index 4b7683dfc21..91b890098bb 100644
--- a/frontend/src/metabase-types/api/database.ts
+++ b/frontend/src/metabase-types/api/database.ts
@@ -204,7 +204,7 @@ export interface GetDatabaseMetadataRequest {
include_hidden?: boolean;
include_editable_data_model?: boolean;
remove_inactive?: boolean;
- skip_fields?: boolean;
+ skip_fields: true; // make sure we don't get every field of every table
}
export interface CreateDatabaseRequest {
diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
index 06e80bbccce..6bbe30e0e49 100644
--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
@@ -12,7 +12,7 @@ import {
import { loadMetadataForCard } from "metabase/questions/actions";
import { setErrorPage } from "metabase/redux/app";
import type { DispatchFn } from "metabase/redux/hooks";
-import { fetchDatabaseMetadata, updateMetadata } from "metabase/redux/metadata";
+import { updateMetadata } from "metabase/redux/metadata";
import { INITIALIZE_QB, resetQB } from "metabase/redux/query-builder";
import type {
Dispatch,
@@ -323,10 +323,6 @@ async function handleQBInit(
dispatch(setErrorPage(NOT_FOUND_ERROR));
return;
}
- await dispatch(fetchDatabaseMetadata(table.db_id));
- if (isStale()) {
- return;
- }
// The /table URL only carries the table id; resolve its db so the QB can
// build the table's default ad-hoc question, just like `?db=&table=`.
options = {
diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts
index 8a0d20e1002..3cb90d61059 100644
--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts
@@ -6,7 +6,6 @@ import * as rtkEndpointUtils from "metabase/api/utils/run-rtk-endpoint";
import * as CardLib from "metabase/common/utils/card";
import * as questionActions from "metabase/questions/actions";
import { setErrorPage } from "metabase/redux/app";
-import * as metadataActions from "metabase/redux/metadata";
import * as sharedQB from "metabase/redux/query-builder";
import {
createMockLocation,
@@ -1001,17 +1000,6 @@ describe("QB Actions > initializeQB", () => {
expect(result.card.displayIsLocked).toBeFalsy();
});
- it("fetches database metadata for schema breadcrumbs (metabase#75393)", async () => {
- const fetchDatabaseMetadataSpy = jest.spyOn(
- metadataActions,
- "fetchDatabaseMetadata",
- );
-
- await setupTableRoute(ORDERS_ID);
-
- expect(fetchDatabaseMetadataSpy).toHaveBeenCalledWith(SAMPLE_DB_ID);
- });
-
it("shows a not-found error for an unknown table", async () => {
const { dispatch } = await setupTableRoute(999999);
expect(dispatch).toHaveBeenCalledWith(
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.tsx
index 9e80f6bb3c1..20d9b3b255d 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.tsx
@@ -3,7 +3,10 @@ import fetchMock from "fetch-mock";
import type { ComponentProps } from "react";
import _ from "underscore";
-import { setupTableEndpoints } from "__support__/server-mocks";
+import {
+ setupListDatabaseSchemasEndpoint,
+ setupTableEndpoints,
+} from "__support__/server-mocks";
import { setupGetUserKeyValueEndpoint } from "__support__/server-mocks/user-key-value";
import { createMockEntitiesState } from "__support__/store";
import { fireEvent, renderWithProviders, screen } from "__support__/ui";
@@ -151,6 +154,7 @@ function setup({
setupTableEndpoints(ORDERS_TABLE);
setupTableEndpoints(PRODUCTS_TABLE);
+ setupListDatabaseSchemasEndpoint(SAMPLE_DB_ID, ["PUBLIC"]);
setupGetUserKeyValueEndpoint({
namespace: "user_acknowledgement",
key: "turn_into_model_modal",
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/DataSourceCrumbs.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/DataSourceCrumbs.tsx
index 9ce00004e93..321310e8967 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/DataSourceCrumbs.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/DataSourceCrumbs.tsx
@@ -1,5 +1,7 @@
import type { ReactElement } from "react";
+import { skipToken, useListDatabaseSchemasQuery } from "metabase/api";
+import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import { HeadBreadcrumbs } from "../HeaderBreadcrumbs/HeaderBreadcrumbs";
@@ -20,10 +22,16 @@ export function DataSourceCrumbs({
isObjectDetail,
...props
}: Props) {
+ const databaseId = Lib.databaseID(question.query());
+ const { data: schemas = [] } = useListDatabaseSchemasQuery(
+ databaseId != null ? { id: databaseId } : skipToken,
+ );
+
const parts = getDataSourceParts({
question,
subHead: variant === "subhead",
isObjectDetail,
+ hasMultipleSchemas: schemas.length > 1,
});
return <HeadBreadcrumbs parts={parts} variant={variant} {...props} />;
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.unit.spec.tsx
index bc2a2f72ce2..9feffd1c141 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.unit.spec.tsx
@@ -4,9 +4,10 @@ import { Component } from "react";
import { createMockMetadata } from "__support__/metadata";
import {
setupCardEndpoints,
+ setupListDatabaseSchemasEndpoint,
setupTableEndpoints,
} from "__support__/server-mocks";
-import { getIcon, renderWithProviders, screen } from "__support__/ui";
+import { getIcon, renderWithProviders, screen, waitFor } from "__support__/ui";
import { deserializeCardFromUrl } from "metabase/common/utils/card";
import * as Urls from "metabase/urls";
import { checkNotNull } from "metabase/utils/types";
@@ -246,6 +247,11 @@ function setup({
const originalQuestion = originalCard && new Question(originalCard, metadata);
setupCardEndpoints(SOURCE_CARD);
+ setupListDatabaseSchemasEndpoint(SAMPLE_DB_ID, ["PUBLIC"]);
+ setupListDatabaseSchemasEndpoint(MULTI_SCHEMA_DB_ID, [
+ MULTI_SCHEMA_TABLE1.schema,
+ MULTI_SCHEMA_TABLE2.schema,
+ ]);
setupTableEndpoints(ORDERS_TABLE);
setupTableEndpoints(PRODUCTS_TABLE);
setupTableEndpoints(PEOPLE_TABLE);
@@ -411,9 +417,11 @@ describe("QuestionDataSource", () => {
.metadata()
.table(Lib.sourceTableOrCardId(question.query())),
);
- const node = await screen.findByText(new RegExp(table.displayName()));
- expect(node).toBeInTheDocument();
- expect(node.closest("a")).not.toBeInTheDocument();
+ await waitFor(() => {
+ const node = screen.getByText(new RegExp(table.displayName()));
+ expect(node).toBeInTheDocument();
+ expect(node.closest("a")).not.toBeInTheDocument();
+ });
});
it("displays table link in subhead variant", async () => {
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx
index 00d33246f18..67e824f66a4 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx
@@ -33,11 +33,13 @@ export function getDataSourceParts({
subHead,
isObjectDetail,
formatTableAsComponent = true,
+ hasMultipleSchemas = false,
}: {
question: Question;
subHead?: boolean;
isObjectDetail?: boolean;
formatTableAsComponent?: boolean;
+ hasMultipleSchemas?: boolean;
}): DataSourcePart[] {
if (!question) {
return [];
@@ -69,7 +71,7 @@ export function getDataSourceParts({
? metadata.table(Lib.sourceTableOrCardId(query))
: // Unjustified type cast. FIXME
(question.legacyNativeQuery() as NativeQuery).table();
- if (table && table.hasSchema()) {
+ if (table?.schema_name && hasMultipleSchemas) {
const isBasedOnSavedQuestion = isVirtualCardId(table.id);
if (database != null && !isBasedOnSavedQuestion) {
parts.push({
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx
index 9a275a09ec1..5987270f021 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx
@@ -1,12 +1,14 @@
import { Fragment, useMemo } from "react";
import { c } from "ttag";
+import { skipToken, useListDatabaseSchemasQuery } from "metabase/api";
import { Link } from "metabase/common/components/Link";
import { SidesheetCardSection } from "metabase/common/components/Sidesheet";
import { useGetIcon } from "metabase/hooks/use-icon";
import { getQuestionWithoutComposing } from "metabase/query_builder/selectors";
import { useSelector } from "metabase/redux";
import { Flex, FixedSizeIcon as Icon } from "metabase/ui";
+import * as Lib from "metabase-lib";
import { getDataSourceParts } from "../../../ViewHeader/components/QuestionDataSource/utils";
@@ -14,9 +16,15 @@ import type { QuestionSource } from "./types";
export const QuestionSources = () => {
const getIcon = useGetIcon();
- /** Retrieve current question from the Redux store */
const underlyingQuestion = useSelector(getQuestionWithoutComposing);
+ const databaseId = underlyingQuestion
+ ? Lib.databaseID(underlyingQuestion.query())
+ : null;
+ const { data: schemas = [] } = useListDatabaseSchemasQuery(
+ databaseId != null ? { id: databaseId } : skipToken,
+ );
+
const sourcesWithIcons: QuestionSource[] = useMemo(() => {
const sources = underlyingQuestion
? // Unjustified type cast. FIXME
@@ -25,13 +33,14 @@ export const QuestionSources = () => {
subHead: false,
isObjectDetail: true,
formatTableAsComponent: false,
+ hasMultipleSchemas: schemas.length > 1,
}) as QuestionSource[]) // note: this type cast is horrendous
: [];
return sources.map((source) => ({
...source,
iconProps: getIcon({ model: source.model ?? "card" }),
}));
- }, [underlyingQuestion, getIcon]);
+ }, [underlyingQuestion, getIcon, schemas.length]);
if (!underlyingQuestion || !sourcesWithIcons.length) {
return null;
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx
index e71997c5e40..84cff58044f 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx
@@ -1,5 +1,6 @@
import _ from "underscore";
+import { setupListDatabaseSchemasEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen, within } from "__support__/ui";
@@ -12,7 +13,10 @@ import { Route } from "metabase/router";
import { convertSavedQuestionToVirtualTable } from "metabase-lib/v1/metadata/utils/saved-questions";
import type { Card, NormalizedTable } from "metabase-types/api";
import { createMockCard, createMockSettings } from "metabase-types/api/mocks";
-import { createSampleDatabase } from "metabase-types/api/mocks/presets";
+import {
+ SAMPLE_DB_ID,
+ createSampleDatabase,
+} from "metabase-types/api/mocks/presets";
import { QuestionSources } from "./QuestionSources";
@@ -57,6 +61,8 @@ const setup = async ({
};
}
+ setupListDatabaseSchemasEndpoint(SAMPLE_DB_ID, ["PUBLIC"]);
+
return renderWithProviders(<Route path="/" element={<QuestionSources />} />, {
withRouter: true,
storeInitialState: state,
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsx
index c65f6ac2452..e59fbe00e17 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsx
@@ -3,6 +3,7 @@ import {
setupAuditInfoEndpoint,
setupCardEndpoints,
setupCardsUsingModelEndpoint,
+ setupListDatabaseSchemasEndpoint,
setupRevisionsEndpoints,
setupTokenStatusEndpoint,
setupUsersEndpoints,
@@ -24,7 +25,10 @@ import {
createMockSettings,
createMockUser,
} from "metabase-types/api/mocks";
-import { createSampleDatabase } from "metabase-types/api/mocks/presets";
+import {
+ SAMPLE_DB_ID,
+ createSampleDatabase,
+} from "metabase-types/api/mocks/presets";
import { QuestionInfoSidebar } from "../QuestionInfoSidebar";
@@ -48,6 +52,7 @@ export const setup = async ({
setupRevisionsEndpoints([]);
setupPerformanceEndpoints([]);
setupAuditInfoEndpoint();
+ setupListDatabaseSchemasEndpoint(SAMPLE_DB_ID, ["PUBLIC"]);
const state = createMockState({
currentUser,
diff --git a/frontend/src/metabase/redux/metadata.ts b/frontend/src/metabase/redux/metadata.ts
index dacac96c520..4e420ce9af4 100644
--- a/frontend/src/metabase/redux/metadata.ts
+++ b/frontend/src/metabase/redux/metadata.ts
@@ -12,6 +12,7 @@ import type {
Database,
DatabaseId,
Field,
+ GetDatabaseMetadataRequest,
Segment,
SegmentId,
Table,
@@ -52,7 +53,7 @@ export const fetchDatabaseMetadata =
(id: DatabaseId, options: { reload?: boolean } = {}) =>
(dispatch: Dispatch): Promise<unknown> =>
runRtkEndpoint(
- { id },
+ { id, skip_fields: true } satisfies GetDatabaseMetadataRequest,
dispatch,
databaseApi.endpoints.getDatabaseMetadata,
{ forceRefetch: options.reload ?? false },
diff --git a/frontend/src/metabase/reference/databases/FieldDetailContainer.tsx b/frontend/src/metabase/reference/databases/FieldDetailContainer.tsx
index 23be59f4b25..989e4629d36 100644
--- a/frontend/src/metabase/reference/databases/FieldDetailContainer.tsx
+++ b/frontend/src/metabase/reference/databases/FieldDetailContainer.tsx
@@ -5,6 +5,7 @@ import { usePrevious } from "react-use";
import CS from "metabase/css/core/index.css";
import { connect, useSelector } from "metabase/redux";
import * as metadataActions from "metabase/redux/metadata";
+import { fetchTableMetadataAndForeignKeys } from "metabase/redux/tables";
import { SidebarLayout } from "metabase/reference/components/SidebarLayout";
import FieldDetail from "metabase/reference/databases/FieldDetail";
import * as actions from "metabase/reference/reference";
@@ -15,21 +16,22 @@ import type { ClearStateProps, FetchProps } from "../reference";
import {
type ReferenceRouteParams,
getDatabase,
- getDatabaseId,
getField,
getIsEditing,
getTable,
+ getTableId,
} from "../selectors";
import FieldSidebar from "./FieldSidebar";
const mapDispatchToProps = {
...metadataActions,
+ fetchTableMetadataAndForeignKeys,
...actions,
};
interface FieldDetailContainerProps extends FetchProps, ClearStateProps {
- fetchDatabaseMetadata: (id: number) => Promise<unknown>;
+ fetchTableMetadataAndForeignKeys: (args: { id: number }) => Promise<unknown>;
}
function FieldDetailContainer(props: FieldDetailContainerProps) {
@@ -40,7 +42,7 @@ function FieldDetailContainer(props: FieldDetailContainerProps) {
const database = useSelector((state) => getDatabase(state, { params }));
const table = useSelector((state) => getTable(state, { params }));
const field = useSelector((state) => getField(state, { params }));
- const databaseId = useSelector((state) => getDatabaseId(state, { params }));
+ const tableId = useSelector((state) => getTableId(state, { params }));
const isEditing = useSelector(getIsEditing);
// `FieldDetail` reads `metadata` but doesn't select it itself.
const metadata = useSelector(getMetadata);
@@ -53,7 +55,7 @@ function FieldDetailContainer(props: FieldDetailContainerProps) {
const didFetch = useRef(false);
if (!didFetch.current) {
didFetch.current = true;
- actions.wrappedFetchDatabaseMetadata(props, databaseId);
+ actions.wrappedFetchTableMetadata(props, tableId);
}
useEffect(() => {
diff --git a/frontend/src/metabase/reference/databases/FieldListContainer.tsx b/frontend/src/metabase/reference/databases/FieldListContainer.tsx
index 1e8cf79c946..f6976063e97 100644
--- a/frontend/src/metabase/reference/databases/FieldListContainer.tsx
+++ b/frontend/src/metabase/reference/databases/FieldListContainer.tsx
@@ -5,6 +5,7 @@ import { usePrevious } from "react-use";
import CS from "metabase/css/core/index.css";
import { connect, useSelector } from "metabase/redux";
import * as metadataActions from "metabase/redux/metadata";
+import { fetchTableMetadataAndForeignKeys } from "metabase/redux/tables";
import { SidebarLayout } from "metabase/reference/components/SidebarLayout";
import FieldList from "metabase/reference/databases/FieldList";
import * as actions from "metabase/reference/reference";
@@ -14,20 +15,21 @@ import type { ClearStateProps, FetchProps } from "../reference";
import {
type ReferenceRouteParams,
getDatabase,
- getDatabaseId,
getIsEditing,
getTable,
+ getTableId,
} from "../selectors";
import TableSidebar from "./TableSidebar";
const mapDispatchToProps = {
...metadataActions,
+ fetchTableMetadataAndForeignKeys,
...actions,
};
interface FieldListContainerProps extends FetchProps, ClearStateProps {
- fetchDatabaseMetadata: (id: number) => Promise<unknown>;
+ fetchTableMetadataAndForeignKeys: (args: { id: number }) => Promise<unknown>;
}
function FieldListContainer(props: FieldListContainerProps) {
@@ -37,7 +39,7 @@ function FieldListContainer(props: FieldListContainerProps) {
const database = useSelector((state) => getDatabase(state, { params }));
const table = useSelector((state) => getTable(state, { params }));
- const databaseId = useSelector((state) => getDatabaseId(state, { params }));
+ const tableId = useSelector((state) => getTableId(state, { params }));
const isEditing = useSelector(getIsEditing);
// Dispatched during render, not from an effect, to reproduce the
@@ -48,7 +50,7 @@ function FieldListContainer(props: FieldListContainerProps) {
const didFetch = useRef(false);
if (!didFetch.current) {
didFetch.current = true;
- actions.wrappedFetchDatabaseMetadata(props, databaseId);
+ actions.wrappedFetchTableMetadata(props, tableId);
}
useEffect(() => {
diff --git a/frontend/src/metabase/reference/reference.ts b/frontend/src/metabase/reference/reference.ts
index 3d143b5f8d6..884941b18c7 100644
--- a/frontend/src/metabase/reference/reference.ts
+++ b/frontend/src/metabase/reference/reference.ts
@@ -55,6 +55,10 @@ interface DatabaseFetchProps extends FetchProps {
fetchRealDatabases: (args: unknown) => Promise<unknown>;
}
+interface TableFetchProps extends FetchProps {
+ fetchTableMetadataAndForeignKeys: (args: { id: number }) => Promise<unknown>;
+}
+
interface SegmentFetchProps extends FetchProps {
fetchSegments: (id?: number) => Promise<unknown>;
fetchSegmentTable: (id: number) => Promise<unknown>;
@@ -104,6 +108,18 @@ export const wrappedFetchDatabaseMetadata = (
fetchDataWrapper(props, props.fetchDatabaseMetadata)(databaseID);
};
+export const wrappedFetchTableMetadata = (
+ props: TableFetchProps,
+ tableID: number,
+) => {
+ fetchDataWrapper(
+ props,
+ props.fetchTableMetadataAndForeignKeys,
+ )({
+ id: tableID,
+ });
+};
+
export const wrappedFetchDatabaseMetadataAndQuestion = async (
props: FetchProps &
Pick<DatabaseFetchProps, "fetchDatabaseMetadata" | "fetchQuestions">,
diff --git a/src/metabase/warehouse_schema/models/field.clj b/src/metabase/warehouse_schema/models/field.clj
index 2a17638584f..24f932832ea 100644
--- a/src/metabase/warehouse_schema/models/field.clj
+++ b/src/metabase/warehouse_schema/models/field.clj
@@ -4,7 +4,6 @@
[honey.sql :as sql]
[medley.core :as m]
[metabase.app-db.core :as mdb]
- [metabase.lib-be.core :as lib-be]
[metabase.lib.core :as lib]
[metabase.lib.schema.metadata]
[metabase.models.humanization :as humanization]
@@ -347,6 +346,18 @@
:let [dimension (get id->dimensions (:id field))]]
(assoc field :dimensions (if dimension [dimension] [])))))
+(defn- field->has-field-values-input
+ "Build the minimal Lib-style column map that [[lib/infer-has-field-values]] reads.
+
+ Going through [[metabase.lib-be.core/instance->metadata]] here would run a full Malli coercion over the ~90-key
+ `::lib.schema.metadata/column` schema for every Field, which dominates the cost of endpoints that hydrate whole
+ databases. The three keys below are the only ones `infer-has-field-values` looks at, and `deftransforms` has already
+ keywordized them. `mu/defn` still validates this map in dev and test."
+ [field]
+ {:base-type (:base_type field)
+ :effective-type (:effective_type field)
+ :has-field-values (:has_field_values field)})
+
(methodical/defmethod t2.hydrate/simple-hydrate [#_model :default #_k :has_field_values]
"Infer what the value of the `has_field_values` should be for Fields where it's not set. See documentation for
[[metabase.lib.schema.metadata/column-has-field-values-options]] for a more detailed explanation of what these
@@ -357,8 +368,7 @@
See [[lib/infer-has-field-values]] for more info."
[_model k field]
(when field
- (let [has-field-values (lib/infer-has-field-values (lib-be/instance->metadata field :metadata/column))]
- (assoc field k has-field-values))))
+ (assoc field k (lib/infer-has-field-values (field->has-field-values-input field)))))
(methodical/defmethod t2.hydrate/needs-hydration? [#_model :default #_k :has_field_values]
"Always (re-)hydrate `:has_field_values`. This is used to convert an existing value of `:auto-list` to
diff --git a/src/metabase/warehouses_rest/api.clj b/src/metabase/warehouses_rest/api.clj
index 2960f6be5e0..7825a99944a 100644
--- a/src/metabase/warehouses_rest/api.clj
+++ b/src/metabase/warehouses_rest/api.clj
@@ -648,7 +648,7 @@
(fn [tables]
(->> tables
(remove :visibility_type)
- (map #(update % :fields filter-sensitive-fields))))))
+ (map #(m/update-existing % :fields filter-sensitive-fields))))))
(update :tables (fn [tables]
(if-not include-editable-data-model?
;; If we're filtering by data model perms, table perm checks were already done by
diff --git a/test/metabase/warehouses_rest/api_test.clj b/test/metabase/warehouses_rest/api_test.clj
index b767f95fcdd..6d72e565abd 100644
--- a/test/metabase/warehouses_rest/api_test.clj
+++ b/test/metabase/warehouses_rest/api_test.clj
@@ -985,11 +985,10 @@
:model/Table table {:db_id db-id}
:model/Field _ {:table_id (u/the-id table)}]
(testing "GET /api/database/:id/metadata?skip_fields=true"
- (let [fields (->> (mt/user-http-request :rasta :get 200 (format "database/%d/metadata?skip_fields=true" db-id))
- :tables
- first
- :fields)]
- (is (= () fields)))))))
+ (let [table (->> (mt/user-http-request :rasta :get 200 (format "database/%d/metadata?skip_fields=true" db-id))
+ :tables
+ first)]
+ (is (not (contains? table :fields))))))))
(deftest ^:parallel autocomplete-suggestions-test
(let [prefix-fn (fn [db-id prefix]