github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

API: Do count distinct since left join duplicates results (#19208)

Browse Source 
* Do count distinct since `left join` duplicates results

* Add changeset

* Correctly access count property

* Update .changeset/angry-suits-compete.md

* Optimize for simple filters

* Add tests

* Workaround broken 'as' for countDistinct in SQLite3

---------

Co-authored-by: Pascal Jufer <pascal-jufer@bluewin.ch>
Co-authored-by: ian <licitdev@gmail.com>
This commit is contained in:
José Varela
2023-07-24 12:32:28 +01:00
committed by GitHub
parent 08f6953822
commit 3a54f0db56
7 changed files with 345 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/src/services/meta.ts
View File

@@ -56,9 +56,10 @@ export class MetaService {
}
async filterCount(collection: string, query: Query): Promise<number> {
const dbQuery = this.knex(collection).count('*', { as: 'count' });
const dbQuery = this.knex(collection);
let filter = query.filter || {};
let hasJoins = false;
if (this.accountability?.admin !== true) {
const permissionsRecord = this.accountability?.permissions?.find((permission) => {
@@ -77,15 +78,23 @@ export class MetaService {
}
if (Object.keys(filter).length > 0) {
applyFilter(this.knex, this.schema, dbQuery, filter, collection, {});
({ hasJoins } = applyFilter(this.knex, this.schema, dbQuery, filter, collection, {}));
}
if (query.search) {
applySearch(this.schema, dbQuery, query.search, collection);
}
if (hasJoins) {
const primaryKeyName = this.schema.collections[collection]!.primary;
dbQuery.countDistinct({ count: [`${collection}.${primaryKeyName}`] });
} else {
dbQuery.count('*', { as: 'count' });
}
const records = await dbQuery;
return Number(records[0]!.count);
return Number(records[0]!['count']);
}
}