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

Fix getting relations

This commit is contained in:
Adria Navarro 2024-12-12 17:10:01 +01:00
parent da92c3bb05
commit ee51503532
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/backend-core/src/sql/sql.ts
View File

@ -1240,11 +1240,6 @@ class InternalBuilder {
continue continue
} }
// Don't include if not required
if (relationship.from && !fields.find(f => f === relationship.from)) {
continue
}
const relatedTable = tables[toTable] const relatedTable = tables[toTable]
if (!relatedTable) { if (!relatedTable) {
throw new Error(`related table "${toTable}" not found in datasource`) throw new Error(`related table "${toTable}" not found in datasource`)
@ -1594,17 +1589,8 @@ class InternalBuilder {
// handle relationships with a CTE for all others // handle relationships with a CTE for all others
if (relationships?.length && aggregations.length === 0) { if (relationships?.length && aggregations.length === 0) {
const mainTable = this.query.tableAliases?.[table.name] || table.name
const cte = this.addSorting(
this.knex
.with("paginated", query.clone().clearSelect().select("*"))
.select(this.generateSelectStatement())
.from({
[mainTable]: "paginated",
})
)
// add JSON aggregations attached to the CTE // add JSON aggregations attached to the CTE
return this.addJsonRelationships(cte, table.name, relationships) return this.addJsonRelationships(query, table.name, relationships)
} }
return query return query