workers-qb 1.6.5 → 1.6.7

package/dist/index.js

@@ -524,8 +524,9 @@ var QueryBuilder = class {
       conditions = value.conditions;
     }
     if (typeof conditions === "string") return ` WHERE ${conditions.toString()}`;
-    if (conditions.length > 0) {
-      return ` WHERE ${conditions.join(" AND ")}`;
+    if (conditions.length === 1) return ` WHERE ${conditions[0].toString()}`;
+    if (conditions.length > 1) {
+      return ` WHERE (${conditions.join(") AND (")})`;
     }
     return "";
   }
@@ -712,26 +713,20 @@ var DOQB = class extends QueryBuilder {
   }
   execute(query) {
     return this.loggerWrapper(query, this.options.logger, () => {
+      let cursor;
       if (query.arguments) {
-        let stmt = this.db.prepare(query.query);
-        const result = stmt(...query.arguments);
-        if (query.fetchType == "ONE" /* ONE */) {
-          return {
-            results: Array.from(result)[0]
-          };
-        }
-        return {
-          results: Array.from(result)
-        };
+        cursor = this.db.exec(query.query, ...query.arguments);
+      } else {
+        cursor = this.db.exec(query.query);
       }
-      const cursor = this.db.exec(query.query);
+      const result = cursor.toArray();
       if (query.fetchType == "ONE" /* ONE */) {
         return {
-          results: Array.from(cursor)[0]
+          results: result.length > 0 ? result[0] : void 0
         };
       }
       return {
-        results: Array.from(cursor)
+        results: result
       };
     });
   }

package/dist/index.mjs

@@ -484,8 +484,9 @@ var QueryBuilder = class {
       conditions = value.conditions;
     }
     if (typeof conditions === "string") return ` WHERE ${conditions.toString()}`;
-    if (conditions.length > 0) {
-      return ` WHERE ${conditions.join(" AND ")}`;
+    if (conditions.length === 1) return ` WHERE ${conditions[0].toString()}`;
+    if (conditions.length > 1) {
+      return ` WHERE (${conditions.join(") AND (")})`;
     }
     return "";
   }
@@ -672,26 +673,20 @@ var DOQB = class extends QueryBuilder {
   }
   execute(query) {
     return this.loggerWrapper(query, this.options.logger, () => {
+      let cursor;
       if (query.arguments) {
-        let stmt = this.db.prepare(query.query);
-        const result = stmt(...query.arguments);
-        if (query.fetchType == "ONE" /* ONE */) {
-          return {
-            results: Array.from(result)[0]
-          };
-        }
-        return {
-          results: Array.from(result)
-        };
+        cursor = this.db.exec(query.query, ...query.arguments);
+      } else {
+        cursor = this.db.exec(query.query);
       }
-      const cursor = this.db.exec(query.query);
+      const result = cursor.toArray();
       if (query.fetchType == "ONE" /* ONE */) {
         return {
-          results: Array.from(cursor)[0]
+          results: result.length > 0 ? result[0] : void 0
         };
       }
       return {
-        results: Array.from(cursor)
+        results: result
       };
     });
   }

package/package.json

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