@type32/tauri-sqlite-orm 0.1.18-0 → 0.1.18-2

package/dist/index.d.mts

@@ -117,6 +117,10 @@ declare class UpdateQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     private updateData;
     constructor(db: Database, table: T);
     set(data: Partial<InferInsertModel<T>>): this;
+    build(): {
+        sql: string;
+        params: any[];
+    };
     execute(): Promise<number>;
 }
 declare class DeleteQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {

package/dist/index.d.ts

@@ -117,6 +117,10 @@ declare class UpdateQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     private updateData;
     constructor(db: Database, table: T);
     set(data: Partial<InferInsertModel<T>>): this;
+    build(): {
+        sql: string;
+        params: any[];
+    };
     execute(): Promise<number>;
 }
 declare class DeleteQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {

package/dist/index.js

@@ -235,7 +235,7 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
   }
   async execute() {
     const { sql, params } = this.build();
-    return this.db.select(sql, ...params);
+    return this.db.select(sql, params);
   }
 };
 var InsertQueryBuilder = class extends BaseQueryBuilder {
@@ -266,7 +266,7 @@ var InsertQueryBuilder = class extends BaseQueryBuilder {
     const params = this.dataSets.flatMap(
       (data) => columns.map((col) => data[col])
     );
-    const result = await this.db.execute(this.query, ...params);
+    const result = await this.db.execute(this.query, params);
     return result.lastInsertId ?? 0;
   }
 };
@@ -281,20 +281,37 @@ var UpdateQueryBuilder = class extends BaseQueryBuilder {
     this.updateData = { ...this.updateData, ...data };
     return this;
   }
-  async execute() {
+  build() {
+    const baseQuery = this.query;
+    const whereParams = this.params;
+    let tablePart = baseQuery;
+    let whereClause = "";
+    const whereIndex = baseQuery.indexOf(" WHERE ");
+    if (whereIndex !== -1) {
+      tablePart = baseQuery.substring(0, whereIndex);
+      whereClause = baseQuery.substring(whereIndex);
+    }
     const entries = Object.entries(this.updateData);
+    if (entries.length === 0) {
+      throw new Error("Cannot execute an update query without a .set() call.");
+    }
     const setClause = entries.map(([key]) => {
       const column = this.table._.columns[key];
-      if (!column)
+      if (!column) {
         throw new Error(
           `Column ${key} does not exist on table ${this.table._.name}`
         );
+      }
       return `${column._.name} = ?`;
     }).join(", ");
-    this.query += ` SET ${setClause}`;
-    this.params.push(...entries.map(([, value]) => value));
+    const setParams = entries.map(([, value]) => value);
+    const sql = `${tablePart} SET ${setClause}${whereClause}`;
+    const params = [...setParams, ...whereParams];
+    return { sql, params };
+  }
+  async execute() {
     const { sql, params } = this.build();
-    const result = await this.db.execute(sql, ...params);
+    const result = await this.db.execute(sql, params);
     return result.rowsAffected;
   }
 };
@@ -306,7 +323,7 @@ var DeleteQueryBuilder = class extends BaseQueryBuilder {
   }
   async execute() {
     const { sql, params } = this.build();
-    const result = await this.db.execute(sql, ...params);
+    const result = await this.db.execute(sql, params);
     return result.rowsAffected;
   }
 };

package/dist/index.mjs

@@ -185,7 +185,7 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
   }
   async execute() {
     const { sql, params } = this.build();
-    return this.db.select(sql, ...params);
+    return this.db.select(sql, params);
   }
 };
 var InsertQueryBuilder = class extends BaseQueryBuilder {
@@ -216,7 +216,7 @@ var InsertQueryBuilder = class extends BaseQueryBuilder {
     const params = this.dataSets.flatMap(
       (data) => columns.map((col) => data[col])
     );
-    const result = await this.db.execute(this.query, ...params);
+    const result = await this.db.execute(this.query, params);
     return result.lastInsertId ?? 0;
   }
 };
@@ -231,20 +231,37 @@ var UpdateQueryBuilder = class extends BaseQueryBuilder {
     this.updateData = { ...this.updateData, ...data };
     return this;
   }
-  async execute() {
+  build() {
+    const baseQuery = this.query;
+    const whereParams = this.params;
+    let tablePart = baseQuery;
+    let whereClause = "";
+    const whereIndex = baseQuery.indexOf(" WHERE ");
+    if (whereIndex !== -1) {
+      tablePart = baseQuery.substring(0, whereIndex);
+      whereClause = baseQuery.substring(whereIndex);
+    }
     const entries = Object.entries(this.updateData);
+    if (entries.length === 0) {
+      throw new Error("Cannot execute an update query without a .set() call.");
+    }
     const setClause = entries.map(([key]) => {
       const column = this.table._.columns[key];
-      if (!column)
+      if (!column) {
         throw new Error(
           `Column ${key} does not exist on table ${this.table._.name}`
         );
+      }
       return `${column._.name} = ?`;
     }).join(", ");
-    this.query += ` SET ${setClause}`;
-    this.params.push(...entries.map(([, value]) => value));
+    const setParams = entries.map(([, value]) => value);
+    const sql = `${tablePart} SET ${setClause}${whereClause}`;
+    const params = [...setParams, ...whereParams];
+    return { sql, params };
+  }
+  async execute() {
     const { sql, params } = this.build();
-    const result = await this.db.execute(sql, ...params);
+    const result = await this.db.execute(sql, params);
     return result.rowsAffected;
   }
 };
@@ -256,7 +273,7 @@ var DeleteQueryBuilder = class extends BaseQueryBuilder {
   }
   async execute() {
     const { sql, params } = this.build();
-    const result = await this.db.execute(sql, ...params);
+    const result = await this.db.execute(sql, params);
     return result.rowsAffected;
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@type32/tauri-sqlite-orm",
-  "version": "0.1.18-0",
+  "version": "0.1.18-2",
   "description": "A Drizzle-like ORM for Tauri v2's SQL JS API plugin.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",