Fix countBuilder

feathersjs · Aug 15, 2024 · a41ce21 · a41ce21
1 parent 6330134
commit a41ce21
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/packages/knex/src/adapter.ts b/packages/knex/src/adapter.ts
@@ -166,10 +166,11 @@ export class KnexAdapter<
   async _find(params?: ServiceParams): Promise<Paginated<Result> | Result[]>
   async _find(params: ServiceParams = {} as ServiceParams): Promise<Paginated<Result> | Result[]> {
     const { filters, paginate } = this.filterQuery(params)
-    const { name, id } = this.getOptions(params)
+    const { Model, name, id } = this.getOptions(params)
     const builder = params.knex ? params.knex.clone() : this.createQuery(params)
-    const countBuilder = builder.clone().clearSelect().clearOrder().count(`${name}.${id} as total`)
-
+    const countBuilder = Model.count(`* as total`)
+      .with('subquery', builder.clone().clearOrder())
+      .from('subquery')
     // Handle $limit
     if (filters.$limit) {
       builder.limit(filters.$limit)