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

package/README.md

@@ -134,7 +134,7 @@ import { eq } from "@type32/tauri-sqlite-orm";
 await db
   .update(users)
   .set({ email: "new.email@example.com" })
-  .where(eq(users.id, 1));
+  .where(eq(users._.columns.id, 1));
 ```
 
 **DELETE**
@@ -143,7 +143,7 @@ await db
 import { eq } from "@type32/tauri-sqlite-orm";
 
 // Delete a user
-await db.delete(users).where(eq(users.id, 1));
+await db.delete(users).where(eq(users._.columns.id, 1));
 ```
 
 ### Migrations
@@ -165,7 +165,7 @@ Run multiple database operations within a transaction to ensure atomicity.
 ```typescript
 await db.transaction(async (tx) => {
   await tx.insert(users).values({ name: "From Transaction" });
-  await tx.delete(users).where(eq(users.id, 1));
+  await tx.delete(users).where(eq(users._.columns.id, 1));
 });
 ```
 

package/dist/index.d.mts

@@ -132,6 +132,7 @@ declare class TauriORM {
     private db;
     private tables;
     constructor(db: Database, schema?: Record<string, AnyTable> | undefined);
+    private buildColumnDefinition;
     migrate(): Promise<void>;
     select<T extends AnyTable, C extends (keyof T["_"]["columns"])[] | undefined = undefined>(table: T, columns?: C): SelectQueryBuilder<T, C>;
     insert<T extends AnyTable>(table: T): InsertQueryBuilder<T>;

package/dist/index.d.ts

@@ -132,6 +132,7 @@ declare class TauriORM {
     private db;
     private tables;
     constructor(db: Database, schema?: Record<string, AnyTable> | undefined);
+    private buildColumnDefinition;
     migrate(): Promise<void>;
     select<T extends AnyTable, C extends (keyof T["_"]["columns"])[] | undefined = undefined>(table: T, columns?: C): SelectQueryBuilder<T, C>;
     insert<T extends AnyTable>(table: T): InsertQueryBuilder<T>;

package/dist/index.js

@@ -254,19 +254,36 @@ 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 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 allKeys = /* @__PURE__ */ new Set();
+    for (const dataSet of processedDataSets) {
+      for (const key of Object.keys(dataSet)) {
+        allKeys.add(key);
+      }
+    }
+    const columns = Array.from(allKeys);
     const columnNames = columns.map(
-      (c) => this.table._.columns[c]._.name
+      (key) => this.table._.columns[key]._.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 placeholders = `(${columns.map(() => "?").join(", ")})`;
+    const valuesSql = processedDataSets.map(() => placeholders).join(", ");
+    const finalQuery = `${this.query} (${columnNames.join(
+      ", "
+    )}) VALUES ${valuesSql}`;
+    const params = processedDataSets.flatMap(
+      (data) => columns.map((col) => data[col] ?? null)
     );
-    const result = await this.db.execute(this.query, params);
+    const result = await this.db.execute(finalQuery, params);
     return result.lastInsertId ?? 0;
   }
 };
@@ -282,6 +299,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 +314,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.");
     }
@@ -337,25 +360,46 @@ var TauriORM = class {
     }
   }
   tables = /* @__PURE__ */ new Map();
+  buildColumnDefinition(col, forAlterTable = false) {
+    let sql = `${col._.name} ${col.type}`;
+    if (col.options.primaryKey && !forAlterTable) {
+      sql += " PRIMARY KEY";
+      if (col._.autoincrement) {
+        sql += " AUTOINCREMENT";
+      }
+    }
+    if (col._.notNull) sql += " NOT NULL";
+    if (col.options.unique) sql += " UNIQUE";
+    if (col.options.default !== void 0) {
+      const value = col.options.default;
+      sql += ` DEFAULT ${typeof value === "string" ? `'${value.replace(/'/g, "''")}'` : value}`;
+    }
+    if (col.options.references) {
+      sql += ` REFERENCES ${col.options.references.table._.name}(${col.options.references.column._.name})`;
+    }
+    return sql;
+  }
   async migrate() {
     for (const table of this.tables.values()) {
-      const columnsSql = Object.entries(table._.columns).map(([name, col]) => {
-        let sql = `${col._.name} ${col.type}`;
-        if (col.options.primaryKey) sql += " PRIMARY KEY";
-        if (col._.autoincrement) sql += " AUTOINCREMENT";
-        if (col._.notNull) sql += " NOT NULL";
-        if (col.options.unique) sql += " UNIQUE";
-        if (col.options.default !== void 0) {
-          const value = col.options.default;
-          sql += ` DEFAULT ${typeof value === "string" ? `'${value}'` : value}`;
-        }
-        if (col.options.references) {
-          sql += ` REFERENCES ${col.options.references.table._.name}(${col.options.references.column._.name})`;
+      const existingTableInfo = await this.db.select(
+        `PRAGMA table_info('${table._.name}')`
+      );
+      if (existingTableInfo.length === 0) {
+        const columnsSql = Object.values(table._.columns).map((col) => this.buildColumnDefinition(col)).join(", ");
+        const createSql = `CREATE TABLE ${table._.name} (${columnsSql})`;
+        await this.db.execute(createSql);
+      } else {
+        const existingColumnNames = new Set(
+          existingTableInfo.map((c) => c.name)
+        );
+        for (const column of Object.values(table._.columns)) {
+          if (!existingColumnNames.has(column._.name)) {
+            const columnSql = this.buildColumnDefinition(column, true);
+            const alterSql = `ALTER TABLE ${table._.name} ADD COLUMN ${columnSql}`;
+            await this.db.execute(alterSql);
+          }
         }
-        return sql;
-      }).join(", ");
-      const createSql = `CREATE TABLE IF NOT EXISTS ${table._.name} (${columnsSql})`;
-      await this.db.execute(createSql);
+      }
     }
   }
   select(table, columns) {
@@ -409,7 +453,10 @@ var TauriORM = class {
       pk: !!col.options.primaryKey,
       ai: !!col._.autoincrement,
       nn: !!col._.notNull,
-      dv: col.options.default && typeof col.options.default === "object" && col.options.default.raw ? { raw: col.options.default.raw } : col.options.default ?? null
+      unique: !!col.options.unique,
+      dv: col.options.default && typeof col.options.default === "object" && col.options.default.raw ? { raw: col.options.default.raw } : col.options.default ?? null,
+      hasDefaultFn: col.options.$defaultFn !== void 0,
+      hasOnUpdateFn: col.options.$onUpdateFn !== void 0
     };
   }
   computeModelSignature() {

package/dist/index.mjs

@@ -204,19 +204,36 @@ 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 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 allKeys = /* @__PURE__ */ new Set();
+    for (const dataSet of processedDataSets) {
+      for (const key of Object.keys(dataSet)) {
+        allKeys.add(key);
+      }
+    }
+    const columns = Array.from(allKeys);
     const columnNames = columns.map(
-      (c) => this.table._.columns[c]._.name
+      (key) => this.table._.columns[key]._.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 placeholders = `(${columns.map(() => "?").join(", ")})`;
+    const valuesSql = processedDataSets.map(() => placeholders).join(", ");
+    const finalQuery = `${this.query} (${columnNames.join(
+      ", "
+    )}) VALUES ${valuesSql}`;
+    const params = processedDataSets.flatMap(
+      (data) => columns.map((col) => data[col] ?? null)
     );
-    const result = await this.db.execute(this.query, params);
+    const result = await this.db.execute(finalQuery, params);
     return result.lastInsertId ?? 0;
   }
 };
@@ -232,6 +249,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 +264,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.");
     }
@@ -287,25 +310,46 @@ var TauriORM = class {
     }
   }
   tables = /* @__PURE__ */ new Map();
+  buildColumnDefinition(col, forAlterTable = false) {
+    let sql = `${col._.name} ${col.type}`;
+    if (col.options.primaryKey && !forAlterTable) {
+      sql += " PRIMARY KEY";
+      if (col._.autoincrement) {
+        sql += " AUTOINCREMENT";
+      }
+    }
+    if (col._.notNull) sql += " NOT NULL";
+    if (col.options.unique) sql += " UNIQUE";
+    if (col.options.default !== void 0) {
+      const value = col.options.default;
+      sql += ` DEFAULT ${typeof value === "string" ? `'${value.replace(/'/g, "''")}'` : value}`;
+    }
+    if (col.options.references) {
+      sql += ` REFERENCES ${col.options.references.table._.name}(${col.options.references.column._.name})`;
+    }
+    return sql;
+  }
   async migrate() {
     for (const table of this.tables.values()) {
-      const columnsSql = Object.entries(table._.columns).map(([name, col]) => {
-        let sql = `${col._.name} ${col.type}`;
-        if (col.options.primaryKey) sql += " PRIMARY KEY";
-        if (col._.autoincrement) sql += " AUTOINCREMENT";
-        if (col._.notNull) sql += " NOT NULL";
-        if (col.options.unique) sql += " UNIQUE";
-        if (col.options.default !== void 0) {
-          const value = col.options.default;
-          sql += ` DEFAULT ${typeof value === "string" ? `'${value}'` : value}`;
-        }
-        if (col.options.references) {
-          sql += ` REFERENCES ${col.options.references.table._.name}(${col.options.references.column._.name})`;
+      const existingTableInfo = await this.db.select(
+        `PRAGMA table_info('${table._.name}')`
+      );
+      if (existingTableInfo.length === 0) {
+        const columnsSql = Object.values(table._.columns).map((col) => this.buildColumnDefinition(col)).join(", ");
+        const createSql = `CREATE TABLE ${table._.name} (${columnsSql})`;
+        await this.db.execute(createSql);
+      } else {
+        const existingColumnNames = new Set(
+          existingTableInfo.map((c) => c.name)
+        );
+        for (const column of Object.values(table._.columns)) {
+          if (!existingColumnNames.has(column._.name)) {
+            const columnSql = this.buildColumnDefinition(column, true);
+            const alterSql = `ALTER TABLE ${table._.name} ADD COLUMN ${columnSql}`;
+            await this.db.execute(alterSql);
+          }
         }
-        return sql;
-      }).join(", ");
-      const createSql = `CREATE TABLE IF NOT EXISTS ${table._.name} (${columnsSql})`;
-      await this.db.execute(createSql);
+      }
     }
   }
   select(table, columns) {
@@ -359,7 +403,10 @@ var TauriORM = class {
       pk: !!col.options.primaryKey,
       ai: !!col._.autoincrement,
       nn: !!col._.notNull,
-      dv: col.options.default && typeof col.options.default === "object" && col.options.default.raw ? { raw: col.options.default.raw } : col.options.default ?? null
+      unique: !!col.options.unique,
+      dv: col.options.default && typeof col.options.default === "object" && col.options.default.raw ? { raw: col.options.default.raw } : col.options.default ?? null,
+      hasDefaultFn: col.options.$defaultFn !== void 0,
+      hasOnUpdateFn: col.options.$onUpdateFn !== void 0
     };
   }
   computeModelSignature() {

package/package.json

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