Fix .count() method for querysets with offset defined

Author: G4brym

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "workers-qb",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Zero dependencies Query Builder for Cloudflare Workers",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package.json

@@ -126,6 +126,7 @@ export class QueryBuilder<GenericResultWrapper> {
       this._select({
         ...params,
         fields: 'count(*) as total',
+        offset: undefined,
         limit: 1,
       }),
       typeof params.where === 'object' && !Array.isArray(params.where) && params.where?.params
@@ -148,6 +149,7 @@ export class QueryBuilder<GenericResultWrapper> {
       this._select({
         ...params,
         fields: 'count(*) as total',
+        offset: undefined,
         limit: 1,
       }),
       typeof params.where === 'object' && !Array.isArray(params.where) && params.where?.params

src/builder.ts

@@ -125,6 +125,41 @@ describe('Select Builder', () => {
     }
   })
 
+  test('count from fetchOne with offset defined', async () => {
+    for (const result of [
+      await new QuerybuilderTest()
+        .fetchOne({
+          tableName: 'testTable',
+          fields: '*',
+          where: {
+            conditions: [],
+            params: [],
+          },
+          offset: 3,
+        })
+        .count(),
+    ]) {
+      expect((result.results as any).query).toEqual('SELECT count(*) as total FROM testTable LIMIT 1')
+      expect((result.results as any).arguments).toEqual([])
+      expect((result.results as any).fetchType).toEqual('ONE')
+    }
+  })
+
+  test('count from fetchAll with offset defined', async () => {
+    for (const result of [
+      await new QuerybuilderTest()
+        .fetchAll({
+          tableName: 'testTable',
+          offset: 4,
+        })
+        .count(),
+    ]) {
+      expect((result.results as any).query).toEqual('SELECT count(*) as total FROM testTable LIMIT 1')
+      expect((result.results as any).arguments).toEqual(undefined)
+      expect((result.results as any).fetchType).toEqual('ONE')
+    }
+  })
+
   test('select with simplified where list', async () => {
     for (const result of [
       new QuerybuilderTest().fetchOne({