sqlite-zod-orm 3.4.0 → 3.4.1

package/dist/index.js

@@ -112,6 +112,8 @@ function compileIQO(tableName, iqo) {
     sql += ` WHERE ${compiled.sql}`;
     params.push(...compiled.params);
   } else if (iqo.wheres.length > 0) {
+    const hasJoins = iqo.joins.length > 0;
+    const qualify = (field) => hasJoins && !field.includes(".") ? `${tableName}.${field}` : field;
     const whereParts = [];
     for (const w of iqo.wheres) {
       if (w.operator === "IN") {
@@ -120,11 +122,11 @@ function compileIQO(tableName, iqo) {
           whereParts.push("1 = 0");
         } else {
           const placeholders = arr.map(() => "?").join(", ");
-          whereParts.push(`${w.field} IN (${placeholders})`);
+          whereParts.push(`${qualify(w.field)} IN (${placeholders})`);
           params.push(...arr.map(transformValueForStorage));
         }
       } else {
-        whereParts.push(`${w.field} ${w.operator} ?`);
+        whereParts.push(`${qualify(w.field)} ${w.operator} ?`);
         params.push(transformValueForStorage(w.value));
       }
     }
@@ -4955,7 +4957,29 @@ class _Database {
       return null;
     };
     const revisionGetter = () => this._getRevision(entityName);
-    const builder = new QueryBuilder(entityName, executor, singleExecutor, joinResolver, null, revisionGetter);
+    const conditionResolver = (conditions) => {
+      const resolved = {};
+      for (const [key, value] of Object.entries(conditions)) {
+        if (value && typeof value === "object" && typeof value.id === "number" && typeof value.delete === "function") {
+          const fkCol = key + "_id";
+          const rel = this.relationships.find((r) => r.type === "belongs-to" && r.from === entityName && r.foreignKey === fkCol);
+          if (rel) {
+            resolved[fkCol] = value.id;
+          } else {
+            const relByNav = this.relationships.find((r) => r.type === "belongs-to" && r.from === entityName && r.to === key + "s") || this.relationships.find((r) => r.type === "belongs-to" && r.from === entityName && r.to === key);
+            if (relByNav) {
+              resolved[relByNav.foreignKey] = value.id;
+            } else {
+              resolved[key] = value;
+            }
+          }
+        } else {
+          resolved[key] = value;
+        }
+      }
+      return resolved;
+    };
+    const builder = new QueryBuilder(entityName, executor, singleExecutor, joinResolver, conditionResolver, revisionGetter);
     if (initialCols.length > 0)
       builder.select(...initialCols);
     return builder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlite-zod-orm",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "Type-safe SQLite ORM for Bun — Zod schemas, fluent queries, auto relationships, zero SQL",
   "type": "module",
   "main": "./dist/index.js",

package/src/database.ts

@@ -453,7 +453,40 @@ class _Database<Schemas extends SchemaMap> {
         // Pass revision getter — allows .subscribe() to detect ALL changes
         const revisionGetter = () => this._getRevision(entityName);
 
-        const builder = new QueryBuilder(entityName, executor, singleExecutor, joinResolver, null, revisionGetter);
+        // Condition resolver: { author: aliceEntity } → { author_id: 1 }
+        const conditionResolver = (conditions: Record<string, any>): Record<string, any> => {
+            const resolved: Record<string, any> = {};
+            for (const [key, value] of Object.entries(conditions)) {
+                // Detect entity references: objects with `id` and `delete` (augmented entities)
+                if (value && typeof value === 'object' && typeof value.id === 'number' && typeof value.delete === 'function') {
+                    // Find a belongs-to relationship: entityName has a FK named `key_id` pointing to another table
+                    const fkCol = key + '_id';
+                    const rel = this.relationships.find(
+                        r => r.type === 'belongs-to' && r.from === entityName && r.foreignKey === fkCol
+                    );
+                    if (rel) {
+                        resolved[fkCol] = value.id;
+                    } else {
+                        // Fallback: try any relationship that matches the key as the nav name
+                        const relByNav = this.relationships.find(
+                            r => r.type === 'belongs-to' && r.from === entityName && r.to === key + 's'
+                        ) || this.relationships.find(
+                            r => r.type === 'belongs-to' && r.from === entityName && r.to === key
+                        );
+                        if (relByNav) {
+                            resolved[relByNav.foreignKey] = value.id;
+                        } else {
+                            resolved[key] = value; // pass through
+                        }
+                    }
+                } else {
+                    resolved[key] = value;
+                }
+            }
+            return resolved;
+        };
+
+        const builder = new QueryBuilder(entityName, executor, singleExecutor, joinResolver, conditionResolver, revisionGetter);
         if (initialCols.length > 0) builder.select(...initialCols);
         return builder;
     }

package/src/query-builder.ts

@@ -86,6 +86,11 @@ export function compileIQO(tableName: string, iqo: IQO): { sql: string; params:
         sql += ` WHERE ${compiled.sql}`;
         params.push(...compiled.params);
     } else if (iqo.wheres.length > 0) {
+        const hasJoins = iqo.joins.length > 0;
+        // When joins exist, qualify bare column names with the main table
+        const qualify = (field: string) =>
+            hasJoins && !field.includes('.') ? `${tableName}.${field}` : field;
+
         const whereParts: string[] = [];
         for (const w of iqo.wheres) {
             if (w.operator === 'IN') {
@@ -94,11 +99,11 @@ export function compileIQO(tableName: string, iqo: IQO): { sql: string; params:
                     whereParts.push('1 = 0');
                 } else {
                     const placeholders = arr.map(() => '?').join(', ');
-                    whereParts.push(`${w.field} IN (${placeholders})`);
+                    whereParts.push(`${qualify(w.field)} IN (${placeholders})`);
                     params.push(...arr.map(transformValueForStorage));
                 }
             } else {
-                whereParts.push(`${w.field} ${w.operator} ?`);
+                whereParts.push(`${qualify(w.field)} ${w.operator} ?`);
                 params.push(transformValueForStorage(w.value));
             }
         }