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

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

@@ -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 {
@@ -128,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

@@ -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 {
@@ -128,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

@@ -281,18 +281,35 @@ 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);
     return result.rowsAffected;
@@ -320,25 +337,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) {
@@ -392,7 +430,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

@@ -231,18 +231,35 @@ 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);
     return result.rowsAffected;
@@ -270,25 +287,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) {
@@ -342,7 +380,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-1",
+  "version": "0.1.18-3",
   "description": "A Drizzle-like ORM for Tauri v2's SQL JS API plugin.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",