fix(knex): Only apply default order for MSSQL (#3145)

daffl · web-flow · commit 28c26279befe · 2023-04-05T14:40:21.000-07:00
diff --git a/packages/knex/src/adapter.ts b/packages/knex/src/adapter.ts
@@ -181,7 +181,7 @@ export class KnexAdapter<
     }
 
     // provide default sorting if its not set
-    if (!filters.$sort) {
+    if (!filters.$sort && builder.client.driverName === 'mssql') {
       builder.orderBy(`${name}.${id}`, 'asc')
     }
 
@@ -238,7 +238,7 @@ export class KnexAdapter<
       return Promise.all(data.map((current) => this._create(current, params)))
     }
 
-    const client = this.db(params).client.config.client
+    const { client } = this.db(params).client.config
     const returning = RETURNING_CLIENTS.includes(client as string) ? [this.id] : []
     const rows: any = await this.db(params).insert(data, returning).catch(errorHandler)
     const id = data[this.id] || rows[0][this.id] || rows[0]

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ export class KnexAdapter<`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`// provide default sorting if its not set`
`184`		`- if (!filters.$sort) {`
	`184`	`+ if (!filters.$sort && builder.client.driverName === 'mssql') {`
`185`	`185`	builder.orderBy(`${name}.${id}`, 'asc')
`186`	`186`	`}`
`187`	`187`
`@@ -238,7 +238,7 @@ export class KnexAdapter<`
`238`	`238`	`return Promise.all(data.map((current) => this._create(current, params)))`
`239`	`239`	`}`
`240`	`240`
`241`		`- const client = this.db(params).client.config.client`
	`241`	`+ const { client } = this.db(params).client.config`
`242`	`242`	`const returning = RETURNING_CLIENTS.includes(client as string) ? [this.id] : []`
`243`	`243`	`const rows: any = await this.db(params).insert(data, returning).catch(errorHandler)`
`244`	`244`	`const id = data[this.id] \|\| rows[0][this.id] \|\| rows[0]`