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

fix column names with spaces for relationship columns

This commit is contained in:
Martin McKeaveney 2025-01-16 14:10:00 +00:00
parent c4eb29fcdb
commit 7c8bef3da7
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1173,7 +1173,13 @@ class InternalBuilder {
} }
if (this.isAggregateField(key)) { if (this.isAggregateField(key)) {
query = query.orderBy(key, direction, nulls) // query = query.orderBy(this.quotedIdentifier(key), direction, nulls)
// query = query.orderBy(this.rawQuotedIdentifier(key), direction, nulls)
query = query.orderByRaw(`?? ??`, [
this.rawQuotedIdentifier(key),
this.knex.raw(direction),
this.knex.raw(nulls as string),
])
} else { } else {
let composite = `${aliased}.${key}` let composite = `${aliased}.${key}`
if (this.client === SqlClient.ORACLE) { if (this.client === SqlClient.ORACLE) {
@ -1183,7 +1189,11 @@ class InternalBuilder {
this.knex.raw(nulls as string), this.knex.raw(nulls as string),
]) ])
} else { } else {
query = query.orderBy(composite, direction, nulls) query = query.orderByRaw(`?? ??`, [
this.rawQuotedIdentifier(composite),
this.knex.raw(direction),
])
// query = query.orderBy(this.quotedIdentifier(key), direction, nulls)
} }
} }
} }
@ -1344,14 +1354,16 @@ class InternalBuilder {
// add the correlation to the overall query // add the correlation to the overall query
subQuery = subQuery.where( subQuery = subQuery.where(
correlatedTo, this.rawQuotedIdentifier(correlatedTo),
"=", "=",
this.rawQuotedIdentifier(correlatedFrom) this.rawQuotedIdentifier(correlatedFrom)
) )
const standardWrap = (select: Knex.Raw): Knex.QueryBuilder => { const standardWrap = (select: Knex.Raw): Knex.QueryBuilder => {
subQuery = subQuery subQuery = subQuery
.select(relationshipFields) .select(
relationshipFields.map(field => this.rawQuotedIdentifier(field))
)
.limit(getRelationshipLimit()) .limit(getRelationshipLimit())
// @ts-ignore - the from alias syntax isn't in Knex typing // @ts-ignore - the from alias syntax isn't in Knex typing
return knex.select(select).from({ return knex.select(select).from({