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

remove nulls for raw and rely on defaults

This commit is contained in:
Martin McKeaveney 2025-01-16 14:29:49 +00:00
parent c077f7e84c
commit 3bd56bdca7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1167,17 +1167,15 @@ 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.orderByRaw(`?? ?? nulls ??`, [ query = query.orderByRaw(`?? ??`, [
this.rawQuotedIdentifier(key), this.rawQuotedIdentifier(key),
this.knex.raw(direction), this.knex.raw(direction),
this.knex.raw(nulls as string),
]) ])
} else { } else {
let composite = `${aliased}.${key}` let composite = `${aliased}.${key}`
@ -1188,10 +1186,9 @@ class InternalBuilder {
this.knex.raw(nulls as string), this.knex.raw(nulls as string),
]) ])
} else { } else {
query = query.orderByRaw(`?? ?? nulls ??`, [ query = query.orderByRaw(`?? ??`, [
this.rawQuotedIdentifier(composite), this.rawQuotedIdentifier(composite),
this.knex.raw(direction), this.knex.raw(direction),
this.knex.raw(nulls as string),
]) ])
} }
} }