MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issues with display names not being sql tables

This commit is contained in:
Adria Navarro 2024-12-17 17:01:06 +01:00
parent bcc9bba254
commit b05b523a6e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/server/src/api/controllers/row/utils/sqlUtils.ts
View File

@ -119,13 +119,14 @@ export async function buildSqlFieldList(
opts?: { relationships: boolean } opts?: { relationships: boolean }
) { ) {
const { relationships } = opts || {} const { relationships } = opts || {}
const nonMappedColumns = [FieldType.LINK, FieldType.FORMULA, FieldType.AI]
function extractRealFields(table: Table, existing: string[] = []) { function extractRealFields(table: Table, existing: string[] = []) {
return Object.entries(table.schema) return Object.entries(table.schema)
.filter( .filter(
([columnName, column]) => ([columnName, column]) =>
column.type !== FieldType.LINK && !nonMappedColumns.includes(column.type) &&
column.type !== FieldType.FORMULA &&
column.type !== FieldType.AI &&
!existing.find((field: string) => field === columnName) !existing.find((field: string) => field === columnName)
) )
.map(([columnName]) => columnName) .map(([columnName]) => columnName)
@ -145,7 +146,10 @@ export async function buildSqlFieldList(
} }
return requiredFields.filter( return requiredFields.filter(
column => !existing.find((field: string) => field === column) column =>
!existing.find((field: string) => field === column) &&
table.schema[column] &&
!nonMappedColumns.includes(table.schema[column].type)
) )
} }
@ -231,6 +235,7 @@ export async function buildSqlFieldList(
} }
const fieldsToAdd = Array.from(viewFields) const fieldsToAdd = Array.from(viewFields)
.filter(f => !nonMappedColumns.includes(relatedTable.schema[f].type))
.map(f => `${relatedTable.name}.${f}`) .map(f => `${relatedTable.name}.${f}`)
.filter(f => !fields.includes(f)) .filter(f => !fields.includes(f))
fields.push(...fieldsToAdd) fields.push(...fieldsToAdd)