From 33f040116d2d7740238e791e08cd939e0908fbe8 Mon Sep 17 00:00:00 2001
From: Benjamin Toby <devops@tben.me>
Date: Sun, 12 Apr 2026 08:36:21 +0100
Subject: [PATCH] Pagination Bugfix #2

---
 dist/utils/sql-generator.js | 8 ++++++--
 package.json                | 2 +-
 src/utils/sql-generator.ts  | 8 ++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/dist/utils/sql-generator.js b/dist/utils/sql-generator.js
index 8ec5d49..e2a9967 100644
--- a/dist/utils/sql-generator.js
+++ b/dist/utils/sql-generator.js
@@ -383,8 +383,12 @@ export default function sqlGenerator({ tableName, genObject, dbFullName, count }
     }
     if (genObject?.limit && !count)
         queryString += ` LIMIT ${genObject.limit}`;
-    if ((genObject?.offset || genObject?.page) && !count)
-        queryString += ` OFFSET ${genObject.offset || genObject?.page}`;
+    if (genObject?.offset && !count) {
+        queryString += ` OFFSET ${genObject.offset}`;
+    }
+    else if (genObject?.page && genObject.limit && !count) {
+        queryString += ` OFFSET ${genObject.page * genObject.limit}`;
+    }
     return {
         string: queryString,
         values: sqlSearhValues,
diff --git a/package.json b/package.json
index d806b10..50affce 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/bun-sqlite",
-    "version": "1.0.31",
+    "version": "1.0.32",
     "description": "SQLite manager for Bun",
     "author": "Benjamin Toby",
     "main": "dist/index.js",
diff --git a/src/utils/sql-generator.ts b/src/utils/sql-generator.ts
index 8c624c1..62fda90 100644
--- a/src/utils/sql-generator.ts
+++ b/src/utils/sql-generator.ts
@@ -513,8 +513,12 @@ export default function sqlGenerator<
     }
 
     if (genObject?.limit && !count) queryString += ` LIMIT ${genObject.limit}`;
-    if ((genObject?.offset || genObject?.page) && !count)
-        queryString += ` OFFSET ${genObject.offset || genObject?.page}`;
+
+    if (genObject?.offset && !count) {
+        queryString += ` OFFSET ${genObject.offset}`;
+    } else if (genObject?.page && genObject.limit && !count) {
+        queryString += ` OFFSET ${genObject.page * genObject.limit}`;
+    }
 
     return {
         string: queryString,