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

re-added nulls

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

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

@ -1167,15 +1167,14 @@ class InternalBuilder {
let nulls: "first" | "last" | undefined = undefined let nulls: "first" | "last" | undefined = undefined
if ( if (
this.client === SqlClient.POSTGRES || this.client === SqlClient.POSTGRES ||
this.client === SqlClient.ORACLE this.client === SqlClient.ORACLE ||
this.client === SqlClient.SQL_LITE
) { ) {
nulls = value.direction === SortOrder.ASCENDING ? "first" : "last" nulls = value.direction === SortOrder.ASCENDING ? "first" : "last"
} }
if (this.isAggregateField(key)) { if (this.isAggregateField(key)) {
// query = query.orderBy(this.quotedIdentifier(key), direction, nulls) query = query.orderByRaw(`?? ?? nulls ??`, [
// query = query.orderBy(this.rawQuotedIdentifier(key), direction, nulls)
query = query.orderByRaw(`?? ??`, [
this.rawQuotedIdentifier(key), this.rawQuotedIdentifier(key),
this.knex.raw(direction), this.knex.raw(direction),
this.knex.raw(nulls as string), this.knex.raw(nulls as string),
@ -1189,11 +1188,11 @@ class InternalBuilder {
this.knex.raw(nulls as string), this.knex.raw(nulls as string),
]) ])
} else { } else {
query = query.orderByRaw(`?? ??`, [ query = query.orderByRaw(`?? ?? nulls ??`, [
this.rawQuotedIdentifier(composite), this.rawQuotedIdentifier(composite),
this.knex.raw(direction), this.knex.raw(direction),
this.knex.raw(nulls as string)
]) ])
// query = query.orderBy(this.quotedIdentifier(key), direction, nulls)
} }
} }
} }