@type32/tauri-sqlite-orm 0.1.18-3 → 0.1.18-5

package/dist/index.js

@@ -254,20 +254,43 @@ var InsertQueryBuilder = class extends BaseQueryBuilder {
     if (this.dataSets.length === 0) {
       throw new Error("No data provided for insert");
     }
-    const columns = Object.keys(
-      this.dataSets[0]
-    );
-    const columnNames = columns.map(
-      (c) => this.table._.columns[c]._.name
-    );
-    const placeholders = `(${columnNames.map(() => "?").join(", ")})`;
-    const valuesSql = this.dataSets.map(() => placeholders).join(", ");
-    this.query += ` (${columnNames.join(", ")}) VALUES ${valuesSql}`;
-    const params = this.dataSets.flatMap(
-      (data) => columns.map((col) => data[col])
-    );
-    const result = await this.db.execute(this.query, params);
-    return result.lastInsertId ?? 0;
+    const processedDataSets = this.dataSets.map((dataSet) => {
+      const finalData = { ...dataSet };
+      for (const [key, column] of Object.entries(this.table._.columns)) {
+        if (finalData[key] === void 0) {
+          if (column.options.$defaultFn) {
+            finalData[key] = column.options.$defaultFn();
+          }
+        }
+      }
+      return finalData;
+    });
+    const groups = /* @__PURE__ */ new Map();
+    for (const dataSet of processedDataSets) {
+      const keys = Object.keys(dataSet).sort().join(",");
+      if (!groups.has(keys)) {
+        groups.set(keys, []);
+      }
+      groups.get(keys).push(dataSet);
+    }
+    let lastInsertId = void 0;
+    for (const [_, dataSets] of groups) {
+      const columns = Object.keys(dataSets[0]);
+      const columnNames = columns.map(
+        (key) => this.table._.columns[key]._.name
+      );
+      const placeholders = `(${columns.map(() => "?").join(", ")})`;
+      const valuesSql = dataSets.map(() => placeholders).join(", ");
+      const finalQuery = `${this.query} (${columnNames.join(
+        ", "
+      )}) VALUES ${valuesSql}`;
+      const params = dataSets.flatMap(
+        (data) => columns.map((col) => data[col] ?? null)
+      );
+      const result = await this.db.execute(finalQuery, params);
+      lastInsertId = result.lastInsertId;
+    }
+    return lastInsertId ?? 0;
   }
 };
 var UpdateQueryBuilder = class extends BaseQueryBuilder {
@@ -282,6 +305,12 @@ var UpdateQueryBuilder = class extends BaseQueryBuilder {
     return this;
   }
   build() {
+    const finalUpdateData = { ...this.updateData };
+    for (const [key, column] of Object.entries(this.table._.columns)) {
+      if (finalUpdateData[key] === void 0 && column.options.$onUpdateFn) {
+        finalUpdateData[key] = column.options.$onUpdateFn();
+      }
+    }
     const baseQuery = this.query;
     const whereParams = this.params;
     let tablePart = baseQuery;
@@ -291,7 +320,7 @@ var UpdateQueryBuilder = class extends BaseQueryBuilder {
       tablePart = baseQuery.substring(0, whereIndex);
       whereClause = baseQuery.substring(whereIndex);
     }
-    const entries = Object.entries(this.updateData);
+    const entries = Object.entries(finalUpdateData);
     if (entries.length === 0) {
       throw new Error("Cannot execute an update query without a .set() call.");
     }

package/dist/index.mjs

@@ -204,20 +204,43 @@ var InsertQueryBuilder = class extends BaseQueryBuilder {
     if (this.dataSets.length === 0) {
       throw new Error("No data provided for insert");
     }
-    const columns = Object.keys(
-      this.dataSets[0]
-    );
-    const columnNames = columns.map(
-      (c) => this.table._.columns[c]._.name
-    );
-    const placeholders = `(${columnNames.map(() => "?").join(", ")})`;
-    const valuesSql = this.dataSets.map(() => placeholders).join(", ");
-    this.query += ` (${columnNames.join(", ")}) VALUES ${valuesSql}`;
-    const params = this.dataSets.flatMap(
-      (data) => columns.map((col) => data[col])
-    );
-    const result = await this.db.execute(this.query, params);
-    return result.lastInsertId ?? 0;
+    const processedDataSets = this.dataSets.map((dataSet) => {
+      const finalData = { ...dataSet };
+      for (const [key, column] of Object.entries(this.table._.columns)) {
+        if (finalData[key] === void 0) {
+          if (column.options.$defaultFn) {
+            finalData[key] = column.options.$defaultFn();
+          }
+        }
+      }
+      return finalData;
+    });
+    const groups = /* @__PURE__ */ new Map();
+    for (const dataSet of processedDataSets) {
+      const keys = Object.keys(dataSet).sort().join(",");
+      if (!groups.has(keys)) {
+        groups.set(keys, []);
+      }
+      groups.get(keys).push(dataSet);
+    }
+    let lastInsertId = void 0;
+    for (const [_, dataSets] of groups) {
+      const columns = Object.keys(dataSets[0]);
+      const columnNames = columns.map(
+        (key) => this.table._.columns[key]._.name
+      );
+      const placeholders = `(${columns.map(() => "?").join(", ")})`;
+      const valuesSql = dataSets.map(() => placeholders).join(", ");
+      const finalQuery = `${this.query} (${columnNames.join(
+        ", "
+      )}) VALUES ${valuesSql}`;
+      const params = dataSets.flatMap(
+        (data) => columns.map((col) => data[col] ?? null)
+      );
+      const result = await this.db.execute(finalQuery, params);
+      lastInsertId = result.lastInsertId;
+    }
+    return lastInsertId ?? 0;
   }
 };
 var UpdateQueryBuilder = class extends BaseQueryBuilder {
@@ -232,6 +255,12 @@ var UpdateQueryBuilder = class extends BaseQueryBuilder {
     return this;
   }
   build() {
+    const finalUpdateData = { ...this.updateData };
+    for (const [key, column] of Object.entries(this.table._.columns)) {
+      if (finalUpdateData[key] === void 0 && column.options.$onUpdateFn) {
+        finalUpdateData[key] = column.options.$onUpdateFn();
+      }
+    }
     const baseQuery = this.query;
     const whereParams = this.params;
     let tablePart = baseQuery;
@@ -241,7 +270,7 @@ var UpdateQueryBuilder = class extends BaseQueryBuilder {
       tablePart = baseQuery.substring(0, whereIndex);
       whereClause = baseQuery.substring(whereIndex);
     }
-    const entries = Object.entries(this.updateData);
+    const entries = Object.entries(finalUpdateData);
     if (entries.length === 0) {
       throw new Error("Cannot execute an update query without a .set() call.");
     }

package/package.json

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