fix count

src/__tests__/query-builder/query.test.ts

@@ -211,11 +211,22 @@ describe('QueryBuilder/query', () => {
   })
 
   describe('count', () => {
-    it('counts the number of rows', async () => {
+    it('should work', async () => {
       const result = await new QueryBuilder(client, 'query').count()
 
       expect(result).toEqual(2)
     })
+
+    it('work with where and ignore orderBy, limit and offset', async () => {
+      const result = await new QueryBuilder(client, 'query')
+        .where('name', 'Alice')
+        .orderBy('id')
+        .limit(1)
+        .offset(1)
+        .count()
+
+      expect(result).toEqual(1)
+    })
   })
 
   describe('first', () => {

src/client.ts

@@ -42,6 +42,8 @@ export class Client {
     let paramIndex = 0
     const text = (query as string).replace(/\?/g, () => `$${++paramIndex}`)
 
+    console.log('raw', text, paramsArray)
+
     return this.postgres.unsafe(text, paramsArray) as Promise<T[]>
   }
 

src/query-builder.ts

@@ -197,8 +197,6 @@ export class QueryBuilder<
       params.push(this.offsetValue)
     }
 
-    console.log(sql.join(' '), params)
-
     return {
       sql: sql.join(' '),
       params,
@@ -224,10 +222,16 @@ export class QueryBuilder<
   }
 
   async count() {
-    this.select('COUNT(*)' as any)
+    const sql = ['SELECT COUNT(*) AS count']
+    const params: any[] = []
 
-    const { sql, params } = this.toSql()
-    const result = await this.client.raw(sql, params)
+    sql.push('FROM', escapeIdentifier(this.table))
+
+    const { sql: whereSql, params: whereParams } = this.buildWhereSql()
+    sql.push(whereSql)
+    params.push(...whereParams)
+
+    const result = await this.client.raw(sql.join(' '), params)
 
     return Number.parseInt(result[0].count, 10)
   }