Skip to content

Commit 8c2ed57

Browse files
authored
Add default schema in mbql appState (#223)
1 parent daf6ad9 commit 8c2ed57

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

apps/src/metabase/helpers/mbql/appState.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export async function getMBQLAppState(): Promise<MetabaseAppStateMBQLEditor | nu
1616
const selectedCatalog = get(find(appSettings.availableCatalogs, { name: appSettings.selectedCatalog }), 'content')
1717
const dbId = await getSelectedDbId();
1818
const selectedDatabaseInfo = dbId ? await getDatabaseInfo(dbId) : undefined
19+
const defaultSchema = selectedDatabaseInfo?.default_schema;
1920
const mbqlState = await getMBQLState();
2021
const mbqlInfo: MBQLInfo = {
2122
mbqlQuery: mbqlState.dataset_query.query
@@ -26,7 +27,13 @@ export async function getMBQLAppState(): Promise<MetabaseAppStateMBQLEditor | nu
2627
const relevantModelsWithFields = await getModelsWithFields(relevantModels)
2728
const sourceTableIds = getSourceTableIds(mbqlState?.dataset_query?.query);
2829

29-
const relevantTablesWithFields = await getTablesWithFields(appSettings.tableDiff, appSettings.drMode, !!selectedCatalog, [], sourceTableIds)
30+
let relevantTablesWithFields = await getTablesWithFields(appSettings.tableDiff, appSettings.drMode, !!selectedCatalog, [], sourceTableIds)
31+
relevantTablesWithFields = relevantTablesWithFields.map(table => {
32+
if (table.schema === undefined || table.schema === '') {
33+
table.schema = defaultSchema || 'unknown'
34+
}
35+
return table
36+
})
3037
const relevantModelsWithFieldsMod = relevantModelsWithFields.map(model => {
3138
return {
3239
...model,

0 commit comments

Comments
 (0)