remove nulls for raw and rely on defaults

Budibase · Jan 16, 2025 · 0b8d024 · 0b8d024
1 parent c077f7e
commit 0b8d024
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/packages/backend-core/src/sql/sql.ts b/packages/backend-core/src/sql/sql.ts
@@ -1167,17 +1167,15 @@ class InternalBuilder {
         let nulls: "first" | "last" | undefined = undefined
         if (
           this.client === SqlClient.POSTGRES ||
-          this.client === SqlClient.ORACLE ||
-          this.client === SqlClient.SQL_LITE
+          this.client === SqlClient.ORACLE
         ) {
           nulls = value.direction === SortOrder.ASCENDING ? "first" : "last"
         }
 
         if (this.isAggregateField(key)) {
-          query = query.orderByRaw(`?? ?? nulls ??`, [
+          query = query.orderByRaw(`?? ??`, [
             this.rawQuotedIdentifier(key),
             this.knex.raw(direction),
-            this.knex.raw(nulls as string),
           ])
         } else {
           let composite = `${aliased}.${key}`
@@ -1188,10 +1186,9 @@ class InternalBuilder {
               this.knex.raw(nulls as string),
             ])
           } else {
-            query = query.orderByRaw(`?? ?? nulls ??`, [
+            query = query.orderByRaw(`?? ??`, [
               this.rawQuotedIdentifier(composite),
               this.knex.raw(direction),
-              this.knex.raw(nulls as string),
             ])
           }
         }
@@ -1361,7 +1358,7 @@ class InternalBuilder {
       const standardWrap = (select: Knex.Raw): Knex.QueryBuilder => {
         subQuery = subQuery
           .select(
-            relationshipFields.map(field => this.rawQuotedIdentifier(field))
+            relationshipFields.map(this.rawQuotedIdentifier)
           )
           .limit(getRelationshipLimit())
         // @ts-ignore - the from alias syntax isn't in Knex typing