fix(sql): allow no results in em.count()

Closes #1135
mikro-orm · Dec 2, 2020 · bc3cdf6 · bc3cdf6
1 parent 2f9498f
commit bc3cdf6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/packages/knex/src/AbstractSqlDriver.ts b/packages/knex/src/AbstractSqlDriver.ts
@@ -174,7 +174,7 @@ export abstract class AbstractSqlDriver<C extends AbstractSqlConnection = Abstra
       .where(where);
     const res = await this.rethrow(qb.execute('get', false));
 
-    return +res.count;
+    return res ? +res.count : 0;
   }
 
   async nativeInsert<T extends AnyEntity<T>>(entityName: string, data: EntityData<T>, ctx?: Transaction<KnexTransaction>, convertCustomTypes = true): Promise<QueryResult> {

diff --git a/tests/EntityManager.postgre.test.ts b/tests/EntityManager.postgre.test.ts
@@ -321,6 +321,9 @@ describe('EntityManagerPostgre', () => {
     const count = await authorRepository.count();
     expect(count).toBe(authors.length);
 
+    const count2 = await authorRepository.count({ favouriteBook: '123' }, { groupBy: 'email' });
+    expect(count2).toBe(0);
+
     // identity map test
     authors.shift(); // shift the god away, as that entity is detached from IM
     expect(jon).toBe(authors[0]);