@type32/tauri-sqlite-orm 0.1.7 → 0.1.9

package/dist/index.d.mts

@@ -188,6 +188,12 @@ declare const notExists: (subquery: SQL | {
 declare const asc: (column: Column) => string;
 declare const desc: (column: Column) => string;
 
+type InferInsert<T> = T extends {
+    $inferInsert: infer I;
+} ? I : never;
+type InferSelect<T> = T extends {
+    $inferSelect: infer S;
+} ? S : never;
 declare class SelectQueryBuilder<T> {
     private _table;
     private _selectedColumns;
@@ -222,11 +228,17 @@ declare class TauriORM {
     constructor(dbUri: string);
     private getDb;
     configureQuery(tables: Record<string, Table<any>>, relations: Record<string, Record<string, RelationConfig>>): void;
-    select<T>(fields?: Record<string, Column<any>>): SelectQueryBuilder<T>;
-    selectDistinct<T>(fields?: Record<string, Column<any>>): SelectQueryBuilder<T>;
-    insert(table: Table<any>): {
-        _table: any;
-        _rows: Record<string, any>[];
+    select<TFields extends Record<string, Column<any>>>(fields: TFields): SelectQueryBuilder<{
+        [K in keyof TFields]: TFields[K]["_dataType"];
+    }>;
+    select<T = any>(fields?: undefined): SelectQueryBuilder<T>;
+    selectDistinct<TFields extends Record<string, Column<any>>>(fields: TFields): SelectQueryBuilder<{
+        [K in keyof TFields]: TFields[K]["_dataType"];
+    }>;
+    selectDistinct<T = any>(fields?: undefined): SelectQueryBuilder<T>;
+    insert<TTable extends Table<any>>(table: TTable): {
+        _table: TTable;
+        _rows: Array<InferInsert<TTable>>;
         _selectSql: {
             clause: string;
             bindings: any[];
@@ -243,7 +255,7 @@ declare class TauriORM {
             setWhere?: SQL;
         };
         _returning: null | "__RETURNING_ID__" | Record<string, Column<any>>;
-        values(rowOrRows: Record<string, any> | Record<string, any>[]): /*elided*/ any;
+        values(rowOrRows: InferInsert<TTable> | Array<InferInsert<TTable>>): /*elided*/ any;
         select(qb: {
             toSQL?: () => {
                 clause: string;
@@ -266,15 +278,15 @@ declare class TauriORM {
         _buildConflictClause(): string;
         _executeWithReturning(db: any, query: string, bindings: any[]): Promise<any>;
     };
-    update(table: Table<any>): {
-        _table: any;
-        _data: Record<string, any> | null;
+    update<TTable extends Table<any>>(table: TTable): {
+        _table: TTable;
+        _data: Partial<InferInsert<TTable>> | null;
         _where: Record<string, any> | SQL | null;
         _orderBy: Array<string | SQL>;
         _limit: number | null;
         _from: Table<any> | null;
         _returning: null | Record<string, Column<any>>;
-        set(data: Record<string, any>): /*elided*/ any;
+        set(data: Partial<InferInsert<TTable>>): /*elided*/ any;
         where(cond: Record<string, any> | SQL): /*elided*/ any;
         orderBy(...clauses: (string | Column<any> | SQL)[]): /*elided*/ any;
         limit(n: number): /*elided*/ any;
@@ -282,22 +294,25 @@ declare class TauriORM {
         returning(fields?: Record<string, Column<any>>): any;
         execute(): Promise<unknown>;
     };
-    delete(table: Table<any>): {
-        _table: any;
-        _where: Record<string, any> | SQL | null;
+    delete<TTable extends Table<any>>(table: TTable): {
+        _table: TTable;
+        _where: Partial<InferInsert<TTable>> | SQL | null;
         _orderBy: Array<string | SQL>;
         _limit: number | null;
         _returning: null | Record<string, Column<any>>;
-        where(cond: Record<string, any> | SQL): /*elided*/ any;
+        where(cond: Partial<InferInsert<TTable>> | SQL): /*elided*/ any;
         orderBy(...clauses: (string | Column<any> | SQL)[]): /*elided*/ any;
         limit(n: number): /*elided*/ any;
         returning(fields?: Record<string, Column<any>>): any;
         execute(): Promise<unknown>;
     };
     run(query: string, bindings?: any[]): Promise<void>;
+    private formatDefaultValue;
     private generateCreateTableSql;
     createTableIfNotExists(table: Table<any>): Promise<void>;
     createTablesIfNotExist(tables: Table<any>[]): Promise<void>;
+    private generateCreateIndexSqls;
+    private createIndexesForTable;
     private ensureMigrationsTable;
     private hasMigration;
     private recordMigration;
@@ -305,7 +320,14 @@ declare class TauriORM {
         name?: string;
         track?: boolean;
     }): Promise<void>;
-    configure(tables: Record<string, Table<any>>, relDefs?: Record<string, Record<string, RelationConfig>>): this;
+    configure<TTables extends Record<string, Table<any>>, TRelDefs extends Record<string, Record<string, RelationConfig>> = Record<string, Record<string, RelationConfig>>>(tables: TTables, relDefs?: TRelDefs): this & {
+        query: {
+            [K in keyof TTables]: {
+                findMany: (opts?: any) => Promise<Array<InferSelect<TTables[K]>>>;
+                findFirst: (opts?: any) => Promise<InferSelect<TTables[K]> | null>;
+            };
+        };
+    };
     migrateConfigured(options?: {
         name?: string;
         track?: boolean;
@@ -348,6 +370,8 @@ declare class TauriORM {
     private setSchemaMeta;
     private normalizeColumn;
     private computeModelSignature;
+    getSchemaSignature(): string;
+    printSchemaDiff(): Promise<void>;
     isSchemaDirty(): Promise<{
         dirty: boolean;
         current: string;
@@ -364,6 +388,7 @@ declare class TauriORM {
         dropExtraColumns?: boolean;
         preserveData?: boolean;
     }): Promise<void>;
+    private forcePushForTables;
 }
 type OneConfig = {
     fields?: Column[];

package/dist/index.d.ts

@@ -188,6 +188,12 @@ declare const notExists: (subquery: SQL | {
 declare const asc: (column: Column) => string;
 declare const desc: (column: Column) => string;
 
+type InferInsert<T> = T extends {
+    $inferInsert: infer I;
+} ? I : never;
+type InferSelect<T> = T extends {
+    $inferSelect: infer S;
+} ? S : never;
 declare class SelectQueryBuilder<T> {
     private _table;
     private _selectedColumns;
@@ -222,11 +228,17 @@ declare class TauriORM {
     constructor(dbUri: string);
     private getDb;
     configureQuery(tables: Record<string, Table<any>>, relations: Record<string, Record<string, RelationConfig>>): void;
-    select<T>(fields?: Record<string, Column<any>>): SelectQueryBuilder<T>;
-    selectDistinct<T>(fields?: Record<string, Column<any>>): SelectQueryBuilder<T>;
-    insert(table: Table<any>): {
-        _table: any;
-        _rows: Record<string, any>[];
+    select<TFields extends Record<string, Column<any>>>(fields: TFields): SelectQueryBuilder<{
+        [K in keyof TFields]: TFields[K]["_dataType"];
+    }>;
+    select<T = any>(fields?: undefined): SelectQueryBuilder<T>;
+    selectDistinct<TFields extends Record<string, Column<any>>>(fields: TFields): SelectQueryBuilder<{
+        [K in keyof TFields]: TFields[K]["_dataType"];
+    }>;
+    selectDistinct<T = any>(fields?: undefined): SelectQueryBuilder<T>;
+    insert<TTable extends Table<any>>(table: TTable): {
+        _table: TTable;
+        _rows: Array<InferInsert<TTable>>;
         _selectSql: {
             clause: string;
             bindings: any[];
@@ -243,7 +255,7 @@ declare class TauriORM {
             setWhere?: SQL;
         };
         _returning: null | "__RETURNING_ID__" | Record<string, Column<any>>;
-        values(rowOrRows: Record<string, any> | Record<string, any>[]): /*elided*/ any;
+        values(rowOrRows: InferInsert<TTable> | Array<InferInsert<TTable>>): /*elided*/ any;
         select(qb: {
             toSQL?: () => {
                 clause: string;
@@ -266,15 +278,15 @@ declare class TauriORM {
         _buildConflictClause(): string;
         _executeWithReturning(db: any, query: string, bindings: any[]): Promise<any>;
     };
-    update(table: Table<any>): {
-        _table: any;
-        _data: Record<string, any> | null;
+    update<TTable extends Table<any>>(table: TTable): {
+        _table: TTable;
+        _data: Partial<InferInsert<TTable>> | null;
         _where: Record<string, any> | SQL | null;
         _orderBy: Array<string | SQL>;
         _limit: number | null;
         _from: Table<any> | null;
         _returning: null | Record<string, Column<any>>;
-        set(data: Record<string, any>): /*elided*/ any;
+        set(data: Partial<InferInsert<TTable>>): /*elided*/ any;
         where(cond: Record<string, any> | SQL): /*elided*/ any;
         orderBy(...clauses: (string | Column<any> | SQL)[]): /*elided*/ any;
         limit(n: number): /*elided*/ any;
@@ -282,22 +294,25 @@ declare class TauriORM {
         returning(fields?: Record<string, Column<any>>): any;
         execute(): Promise<unknown>;
     };
-    delete(table: Table<any>): {
-        _table: any;
-        _where: Record<string, any> | SQL | null;
+    delete<TTable extends Table<any>>(table: TTable): {
+        _table: TTable;
+        _where: Partial<InferInsert<TTable>> | SQL | null;
         _orderBy: Array<string | SQL>;
         _limit: number | null;
         _returning: null | Record<string, Column<any>>;
-        where(cond: Record<string, any> | SQL): /*elided*/ any;
+        where(cond: Partial<InferInsert<TTable>> | SQL): /*elided*/ any;
         orderBy(...clauses: (string | Column<any> | SQL)[]): /*elided*/ any;
         limit(n: number): /*elided*/ any;
         returning(fields?: Record<string, Column<any>>): any;
         execute(): Promise<unknown>;
     };
     run(query: string, bindings?: any[]): Promise<void>;
+    private formatDefaultValue;
     private generateCreateTableSql;
     createTableIfNotExists(table: Table<any>): Promise<void>;
     createTablesIfNotExist(tables: Table<any>[]): Promise<void>;
+    private generateCreateIndexSqls;
+    private createIndexesForTable;
     private ensureMigrationsTable;
     private hasMigration;
     private recordMigration;
@@ -305,7 +320,14 @@ declare class TauriORM {
         name?: string;
         track?: boolean;
     }): Promise<void>;
-    configure(tables: Record<string, Table<any>>, relDefs?: Record<string, Record<string, RelationConfig>>): this;
+    configure<TTables extends Record<string, Table<any>>, TRelDefs extends Record<string, Record<string, RelationConfig>> = Record<string, Record<string, RelationConfig>>>(tables: TTables, relDefs?: TRelDefs): this & {
+        query: {
+            [K in keyof TTables]: {
+                findMany: (opts?: any) => Promise<Array<InferSelect<TTables[K]>>>;
+                findFirst: (opts?: any) => Promise<InferSelect<TTables[K]> | null>;
+            };
+        };
+    };
     migrateConfigured(options?: {
         name?: string;
         track?: boolean;
@@ -348,6 +370,8 @@ declare class TauriORM {
     private setSchemaMeta;
     private normalizeColumn;
     private computeModelSignature;
+    getSchemaSignature(): string;
+    printSchemaDiff(): Promise<void>;
     isSchemaDirty(): Promise<{
         dirty: boolean;
         current: string;
@@ -364,6 +388,7 @@ declare class TauriORM {
         dropExtraColumns?: boolean;
         preserveData?: boolean;
     }): Promise<void>;
+    private forcePushForTables;
 }
 type OneConfig = {
     fields?: Column[];

package/dist/index.js

@@ -213,12 +213,19 @@ function unique(name) {
   return {
     on: (...cols) => ({
       name,
-      columns: cols.map((c) => c.name)
+      columns: cols.map((c) => c.name),
+      // runtime marker for DDL rendering
+      kind: "unique"
     })
   };
 }
 function primaryKey(opts) {
-  return { name: opts.name, columns: opts.columns.map((c) => c.name) };
+  return {
+    name: opts.name,
+    columns: opts.columns.map((c) => c.name),
+    // runtime marker for DDL rendering
+    kind: "primaryKey"
+  };
 }
 function check(name, expr) {
   return { name, expr };
@@ -647,7 +654,10 @@ var TauriORM = class {
   _relations = null;
   _dbPromise;
   constructor(dbUri) {
-    this._dbPromise = import_plugin_sql.default.load(dbUri);
+    this._dbPromise = import_plugin_sql.default.load(dbUri).then(async (db) => {
+      await db.execute("PRAGMA foreign_keys = ON");
+      return db;
+    });
   }
   async getDb() {
     return this._dbPromise;
@@ -721,7 +731,7 @@ var TauriORM = class {
           return ret;
         }
         for (const data of this._rows) {
-          const finalData = { ...data };
+          const finalData = Object.assign({}, data);
           const schema = this._table._schema;
           for (const [key, col] of Object.entries(schema)) {
             if (finalData[key] === void 0) {
@@ -975,6 +985,25 @@ var TauriORM = class {
     await db.execute(query, bindings);
   }
   // --- Migrations API ---
+  formatDefaultValue(col) {
+    const dv = col.defaultValue;
+    if (dv === void 0) return null;
+    if (dv && typeof dv === "object" && "raw" in dv) {
+      return dv.raw;
+    }
+    if (dv instanceof Date) {
+      const isMs = col.mode === "timestamp_ms";
+      const num = isMs ? dv.getTime() : Math.floor(dv.getTime() / 1e3);
+      return String(num);
+    }
+    if (col.mode === "boolean") {
+      return String(dv ? 1 : 0);
+    }
+    if (typeof dv === "string") {
+      return `'${dv.replace(/'/g, "''")}'`;
+    }
+    return String(dv);
+  }
   generateCreateTableSql(table) {
     const tableName = table._tableName;
     const columns = Object.values(table._schema);
@@ -985,14 +1014,8 @@ var TauriORM = class {
       }
       if (col.isNotNull) def += " NOT NULL";
       if (col.defaultValue !== void 0) {
-        const dv = col.defaultValue;
-        if (dv && typeof dv === "object" && "raw" in dv) {
-          def += ` DEFAULT ${dv.raw}`;
-        } else if (typeof dv === "string") {
-          def += ` DEFAULT '${dv.replace(/'/g, "''")}'`;
-        } else {
-          def += ` DEFAULT ${dv}`;
-        }
+        const formatted = this.formatDefaultValue(col);
+        if (formatted !== null) def += ` DEFAULT ${formatted}`;
       }
       if (col.references && !col.isPrimaryKey) {
         def += ` REFERENCES ${col.references.table} (${col.references.column})`;
@@ -1003,19 +1026,86 @@ var TauriORM = class {
       }
       return def;
     });
-    return `CREATE TABLE IF NOT EXISTS ${tableName} (${columnDefs.join(
-      ", "
-    )});`;
+    const tableConstraints = [];
+    const constraints = table._constraints;
+    if (constraints && constraints.length) {
+      for (const spec of constraints) {
+        if (spec.expr) {
+          const name = spec.name;
+          const expr = spec.expr.raw ?? spec.expr?.raw ?? String(spec.expr);
+          tableConstraints.push(
+            name ? `CONSTRAINT ${name} CHECK (${expr})` : `CHECK (${expr})`
+          );
+          continue;
+        }
+        if (spec.foreignColumns) {
+          const name = spec.name;
+          const cols = spec.columns.join(", ");
+          const fTable = spec.foreignTable;
+          const fCols = spec.foreignColumns.join(", ");
+          let clause = `${name ? `CONSTRAINT ${name} ` : ""}FOREIGN KEY (${cols}) REFERENCES ${fTable} (${fCols})`;
+          if (spec.onDelete)
+            clause += ` ON DELETE ${String(
+              spec.onDelete
+            ).toUpperCase()}`;
+          if (spec.onUpdate)
+            clause += ` ON UPDATE ${String(
+              spec.onUpdate
+            ).toUpperCase()}`;
+          tableConstraints.push(clause);
+          continue;
+        }
+        if (spec.columns) {
+          const cols = spec.columns.join(", ");
+          const name = spec.name;
+          const isPk = spec.kind === "primaryKey" || name && name.toLowerCase().includes("pk");
+          if (isPk) {
+            tableConstraints.push(
+              name ? `CONSTRAINT ${name} PRIMARY KEY (${cols})` : `PRIMARY KEY (${cols})`
+            );
+          } else {
+            tableConstraints.push(
+              name ? `CONSTRAINT ${name} UNIQUE (${cols})` : `UNIQUE (${cols})`
+            );
+          }
+          continue;
+        }
+      }
+    }
+    const parts = [...columnDefs, ...tableConstraints];
+    return `CREATE TABLE IF NOT EXISTS ${tableName} (${parts.join(", ")});`;
   }
   async createTableIfNotExists(table) {
     const sql2 = this.generateCreateTableSql(table);
     await this.run(sql2);
+    await this.createIndexesForTable(table);
   }
   async createTablesIfNotExist(tables) {
     for (const t of tables) {
       await this.createTableIfNotExists(t);
     }
   }
+  generateCreateIndexSqls(table) {
+    const tableName = table._tableName;
+    const indexes = table._indexes || [];
+    const stmts = [];
+    for (const idx of indexes) {
+      const unique2 = idx.unique ? "UNIQUE " : "";
+      if (!idx.name) continue;
+      const colList = Array.isArray(idx.columns) ? idx.columns : [];
+      if (colList.length === 0) continue;
+      const cols = `(${colList.join(", ")})`;
+      const where = idx.where?.raw ? ` WHERE ${idx.where.raw}` : "";
+      stmts.push(
+        `CREATE ${unique2}INDEX IF NOT EXISTS ${idx.name} ON ${tableName} ${cols}${where};`
+      );
+    }
+    return stmts;
+  }
+  async createIndexesForTable(table) {
+    const stmts = this.generateCreateIndexSqls(table);
+    for (const s of stmts) await this.run(s);
+  }
   async ensureMigrationsTable() {
     await this.run(
       `CREATE TABLE IF NOT EXISTS _migrations (name TEXT PRIMARY KEY, applied_at INTEGER NOT NULL)`
@@ -1040,20 +1130,23 @@ var TauriORM = class {
     const track = options?.track ?? true;
     if (track) {
       await this.ensureMigrationsTable();
+    }
+    await this.forcePushForTables(tables, { preserveData: true });
+    if (track) {
       const name = options?.name ?? `init:${tables.map((t) => t._tableName).join(",")}`;
       const already = await this.hasMigration(name);
-      if (already) return;
-      await this.createTablesIfNotExist(tables);
-      await this.recordMigration(name);
-      return;
+      if (!already) await this.recordMigration(name);
     }
-    await this.createTablesIfNotExist(tables);
   }
   // Configure schema and relations, and generate db.query automatically
   configure(tables, relDefs) {
     this._tables = tables;
     this._relations = relDefs ?? {};
-    this.query = makeQueryAPI(tables, this._relations, this.getDb.bind(this));
+    this.query = makeQueryAPI(
+      tables,
+      this._relations ?? {},
+      this.getDb.bind(this)
+    );
     return this;
   }
   // Convenience: migrate from configured tables
@@ -1061,6 +1154,7 @@ var TauriORM = class {
     if (!this._tables)
       throw new Error("No tables configured. Call db.configure({...}) first.");
     await this.migrate(Object.values(this._tables), options);
+    await this.setSchemaMeta("schema_signature", this.computeModelSignature());
   }
   // --- Schema diff and CLI-like helpers ---
   async diffSchema() {
@@ -1187,6 +1281,13 @@ var TauriORM = class {
     entries.sort((a, b) => a.table.localeCompare(b.table));
     return JSON.stringify(entries);
   }
+  getSchemaSignature() {
+    return this.computeModelSignature();
+  }
+  async printSchemaDiff() {
+    const diff = await this.diffSchema();
+    console.log("Schema diff:", JSON.stringify(diff, null, 2));
+  }
   async isSchemaDirty() {
     const sig = this.computeModelSignature();
     const stored = await this.getSchemaMeta("schema_signature");
@@ -1196,7 +1297,9 @@ var TauriORM = class {
     const status = await this.isSchemaDirty();
     if (!this._tables) throw new Error("No tables configured.");
     if (status.dirty) {
-      await this.migrate(Object.values(this._tables), options);
+      await this.forcePushForTables(Object.values(this._tables), {
+        preserveData: true
+      });
       await this.setSchemaMeta(
         "schema_signature",
         this.computeModelSignature()
@@ -1237,13 +1340,17 @@ var TauriORM = class {
   // Force push model to DB: add missing tables/columns, rebuild tables if incompatible
   async forcePush(options) {
     if (!this._tables) throw new Error("No tables configured.");
+    await this.forcePushForTables(Object.values(this._tables), options);
+  }
+  async forcePushForTables(tables, options) {
     const dbi = await this.getDb();
     const preserve = options?.preserveData !== false;
-    for (const tbl of Object.values(this._tables)) {
+    for (const tbl of tables) {
       const tableName = tbl._tableName;
       const exists2 = await this.tableExists(tableName);
       if (!exists2) {
         await this.run(this.buildCreateTableSQL(tbl));
+        await this.createIndexesForTable(tbl);
         continue;
       }
       const existingCols = await dbi.select(
@@ -1288,20 +1395,18 @@ var TauriORM = class {
         }
         await this.run(`DROP TABLE ${tableName}`);
         await this.run(`ALTER TABLE ${tmp} RENAME TO ${tableName}`);
+        await this.createIndexesForTable(tbl);
       } else {
         for (const m of missing) {
           let clause = `${m.name} ${m.type}`;
           if (m.isNotNull) clause += " NOT NULL";
           if (m.defaultValue !== void 0) {
-            const dv = m.defaultValue;
-            if (dv && typeof dv === "object" && "raw" in dv)
-              clause += ` DEFAULT ${dv.raw}`;
-            else if (typeof dv === "string")
-              clause += ` DEFAULT '${dv.replace(/'/g, "''")}'`;
-            else clause += ` DEFAULT ${dv}`;
+            const formatted = this.formatDefaultValue(m);
+            if (formatted !== null) clause += ` DEFAULT ${formatted}`;
           }
           await this.run(`ALTER TABLE ${tableName} ADD COLUMN ${clause}`);
         }
+        await this.createIndexesForTable(tbl);
       }
     }
     await this.setSchemaMeta("schema_signature", this.computeModelSignature());

package/dist/index.mjs

@@ -135,12 +135,19 @@ function unique(name) {
   return {
     on: (...cols) => ({
       name,
-      columns: cols.map((c) => c.name)
+      columns: cols.map((c) => c.name),
+      // runtime marker for DDL rendering
+      kind: "unique"
     })
   };
 }
 function primaryKey(opts) {
-  return { name: opts.name, columns: opts.columns.map((c) => c.name) };
+  return {
+    name: opts.name,
+    columns: opts.columns.map((c) => c.name),
+    // runtime marker for DDL rendering
+    kind: "primaryKey"
+  };
 }
 function check(name, expr) {
   return { name, expr };
@@ -569,7 +576,10 @@ var TauriORM = class {
   _relations = null;
   _dbPromise;
   constructor(dbUri) {
-    this._dbPromise = Database.load(dbUri);
+    this._dbPromise = Database.load(dbUri).then(async (db) => {
+      await db.execute("PRAGMA foreign_keys = ON");
+      return db;
+    });
   }
   async getDb() {
     return this._dbPromise;
@@ -643,7 +653,7 @@ var TauriORM = class {
           return ret;
         }
         for (const data of this._rows) {
-          const finalData = { ...data };
+          const finalData = Object.assign({}, data);
           const schema = this._table._schema;
           for (const [key, col] of Object.entries(schema)) {
             if (finalData[key] === void 0) {
@@ -897,6 +907,25 @@ var TauriORM = class {
     await db.execute(query, bindings);
   }
   // --- Migrations API ---
+  formatDefaultValue(col) {
+    const dv = col.defaultValue;
+    if (dv === void 0) return null;
+    if (dv && typeof dv === "object" && "raw" in dv) {
+      return dv.raw;
+    }
+    if (dv instanceof Date) {
+      const isMs = col.mode === "timestamp_ms";
+      const num = isMs ? dv.getTime() : Math.floor(dv.getTime() / 1e3);
+      return String(num);
+    }
+    if (col.mode === "boolean") {
+      return String(dv ? 1 : 0);
+    }
+    if (typeof dv === "string") {
+      return `'${dv.replace(/'/g, "''")}'`;
+    }
+    return String(dv);
+  }
   generateCreateTableSql(table) {
     const tableName = table._tableName;
     const columns = Object.values(table._schema);
@@ -907,14 +936,8 @@ var TauriORM = class {
       }
       if (col.isNotNull) def += " NOT NULL";
       if (col.defaultValue !== void 0) {
-        const dv = col.defaultValue;
-        if (dv && typeof dv === "object" && "raw" in dv) {
-          def += ` DEFAULT ${dv.raw}`;
-        } else if (typeof dv === "string") {
-          def += ` DEFAULT '${dv.replace(/'/g, "''")}'`;
-        } else {
-          def += ` DEFAULT ${dv}`;
-        }
+        const formatted = this.formatDefaultValue(col);
+        if (formatted !== null) def += ` DEFAULT ${formatted}`;
       }
       if (col.references && !col.isPrimaryKey) {
         def += ` REFERENCES ${col.references.table} (${col.references.column})`;
@@ -925,19 +948,86 @@ var TauriORM = class {
       }
       return def;
     });
-    return `CREATE TABLE IF NOT EXISTS ${tableName} (${columnDefs.join(
-      ", "
-    )});`;
+    const tableConstraints = [];
+    const constraints = table._constraints;
+    if (constraints && constraints.length) {
+      for (const spec of constraints) {
+        if (spec.expr) {
+          const name = spec.name;
+          const expr = spec.expr.raw ?? spec.expr?.raw ?? String(spec.expr);
+          tableConstraints.push(
+            name ? `CONSTRAINT ${name} CHECK (${expr})` : `CHECK (${expr})`
+          );
+          continue;
+        }
+        if (spec.foreignColumns) {
+          const name = spec.name;
+          const cols = spec.columns.join(", ");
+          const fTable = spec.foreignTable;
+          const fCols = spec.foreignColumns.join(", ");
+          let clause = `${name ? `CONSTRAINT ${name} ` : ""}FOREIGN KEY (${cols}) REFERENCES ${fTable} (${fCols})`;
+          if (spec.onDelete)
+            clause += ` ON DELETE ${String(
+              spec.onDelete
+            ).toUpperCase()}`;
+          if (spec.onUpdate)
+            clause += ` ON UPDATE ${String(
+              spec.onUpdate
+            ).toUpperCase()}`;
+          tableConstraints.push(clause);
+          continue;
+        }
+        if (spec.columns) {
+          const cols = spec.columns.join(", ");
+          const name = spec.name;
+          const isPk = spec.kind === "primaryKey" || name && name.toLowerCase().includes("pk");
+          if (isPk) {
+            tableConstraints.push(
+              name ? `CONSTRAINT ${name} PRIMARY KEY (${cols})` : `PRIMARY KEY (${cols})`
+            );
+          } else {
+            tableConstraints.push(
+              name ? `CONSTRAINT ${name} UNIQUE (${cols})` : `UNIQUE (${cols})`
+            );
+          }
+          continue;
+        }
+      }
+    }
+    const parts = [...columnDefs, ...tableConstraints];
+    return `CREATE TABLE IF NOT EXISTS ${tableName} (${parts.join(", ")});`;
   }
   async createTableIfNotExists(table) {
     const sql2 = this.generateCreateTableSql(table);
     await this.run(sql2);
+    await this.createIndexesForTable(table);
   }
   async createTablesIfNotExist(tables) {
     for (const t of tables) {
       await this.createTableIfNotExists(t);
     }
   }
+  generateCreateIndexSqls(table) {
+    const tableName = table._tableName;
+    const indexes = table._indexes || [];
+    const stmts = [];
+    for (const idx of indexes) {
+      const unique2 = idx.unique ? "UNIQUE " : "";
+      if (!idx.name) continue;
+      const colList = Array.isArray(idx.columns) ? idx.columns : [];
+      if (colList.length === 0) continue;
+      const cols = `(${colList.join(", ")})`;
+      const where = idx.where?.raw ? ` WHERE ${idx.where.raw}` : "";
+      stmts.push(
+        `CREATE ${unique2}INDEX IF NOT EXISTS ${idx.name} ON ${tableName} ${cols}${where};`
+      );
+    }
+    return stmts;
+  }
+  async createIndexesForTable(table) {
+    const stmts = this.generateCreateIndexSqls(table);
+    for (const s of stmts) await this.run(s);
+  }
   async ensureMigrationsTable() {
     await this.run(
       `CREATE TABLE IF NOT EXISTS _migrations (name TEXT PRIMARY KEY, applied_at INTEGER NOT NULL)`
@@ -962,20 +1052,23 @@ var TauriORM = class {
     const track = options?.track ?? true;
     if (track) {
       await this.ensureMigrationsTable();
+    }
+    await this.forcePushForTables(tables, { preserveData: true });
+    if (track) {
       const name = options?.name ?? `init:${tables.map((t) => t._tableName).join(",")}`;
       const already = await this.hasMigration(name);
-      if (already) return;
-      await this.createTablesIfNotExist(tables);
-      await this.recordMigration(name);
-      return;
+      if (!already) await this.recordMigration(name);
     }
-    await this.createTablesIfNotExist(tables);
   }
   // Configure schema and relations, and generate db.query automatically
   configure(tables, relDefs) {
     this._tables = tables;
     this._relations = relDefs ?? {};
-    this.query = makeQueryAPI(tables, this._relations, this.getDb.bind(this));
+    this.query = makeQueryAPI(
+      tables,
+      this._relations ?? {},
+      this.getDb.bind(this)
+    );
     return this;
   }
   // Convenience: migrate from configured tables
@@ -983,6 +1076,7 @@ var TauriORM = class {
     if (!this._tables)
       throw new Error("No tables configured. Call db.configure({...}) first.");
     await this.migrate(Object.values(this._tables), options);
+    await this.setSchemaMeta("schema_signature", this.computeModelSignature());
   }
   // --- Schema diff and CLI-like helpers ---
   async diffSchema() {
@@ -1109,6 +1203,13 @@ var TauriORM = class {
     entries.sort((a, b) => a.table.localeCompare(b.table));
     return JSON.stringify(entries);
   }
+  getSchemaSignature() {
+    return this.computeModelSignature();
+  }
+  async printSchemaDiff() {
+    const diff = await this.diffSchema();
+    console.log("Schema diff:", JSON.stringify(diff, null, 2));
+  }
   async isSchemaDirty() {
     const sig = this.computeModelSignature();
     const stored = await this.getSchemaMeta("schema_signature");
@@ -1118,7 +1219,9 @@ var TauriORM = class {
     const status = await this.isSchemaDirty();
     if (!this._tables) throw new Error("No tables configured.");
     if (status.dirty) {
-      await this.migrate(Object.values(this._tables), options);
+      await this.forcePushForTables(Object.values(this._tables), {
+        preserveData: true
+      });
       await this.setSchemaMeta(
         "schema_signature",
         this.computeModelSignature()
@@ -1159,13 +1262,17 @@ var TauriORM = class {
   // Force push model to DB: add missing tables/columns, rebuild tables if incompatible
   async forcePush(options) {
     if (!this._tables) throw new Error("No tables configured.");
+    await this.forcePushForTables(Object.values(this._tables), options);
+  }
+  async forcePushForTables(tables, options) {
     const dbi = await this.getDb();
     const preserve = options?.preserveData !== false;
-    for (const tbl of Object.values(this._tables)) {
+    for (const tbl of tables) {
       const tableName = tbl._tableName;
       const exists2 = await this.tableExists(tableName);
       if (!exists2) {
         await this.run(this.buildCreateTableSQL(tbl));
+        await this.createIndexesForTable(tbl);
         continue;
       }
       const existingCols = await dbi.select(
@@ -1210,20 +1317,18 @@ var TauriORM = class {
         }
         await this.run(`DROP TABLE ${tableName}`);
         await this.run(`ALTER TABLE ${tmp} RENAME TO ${tableName}`);
+        await this.createIndexesForTable(tbl);
       } else {
         for (const m of missing) {
           let clause = `${m.name} ${m.type}`;
           if (m.isNotNull) clause += " NOT NULL";
           if (m.defaultValue !== void 0) {
-            const dv = m.defaultValue;
-            if (dv && typeof dv === "object" && "raw" in dv)
-              clause += ` DEFAULT ${dv.raw}`;
-            else if (typeof dv === "string")
-              clause += ` DEFAULT '${dv.replace(/'/g, "''")}'`;
-            else clause += ` DEFAULT ${dv}`;
+            const formatted = this.formatDefaultValue(m);
+            if (formatted !== null) clause += ` DEFAULT ${formatted}`;
           }
           await this.run(`ALTER TABLE ${tableName} ADD COLUMN ${clause}`);
         }
+        await this.createIndexesForTable(tbl);
       }
     }
     await this.setSchemaMeta("schema_signature", this.computeModelSignature());

package/package.json

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