From bc3cdf6ae39a809b9507d888f2d190ccde1ece75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ad=C3=A1mek?= <banan23@gmail.com>
Date: Wed, 2 Dec 2020 12:48:02 +0100
Subject: [PATCH] fix(sql): allow no results in `em.count()`

Closes #1135
---
 packages/knex/src/AbstractSqlDriver.ts | 2 +-
 tests/EntityManager.postgre.test.ts    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/knex/src/AbstractSqlDriver.ts b/packages/knex/src/AbstractSqlDriver.ts
index 248660e2ef2b..3d4ab368249e 100644
--- 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
index da68f94a74a1..009ad64447ec 100644
--- 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]);