@an5/orm 1.1.0 → 1.1.1

package/dist/generator/src/golang-generator.js

@@ -289,7 +289,7 @@ func detectDialect(connStr string) Dialect {
 \tif strings.HasPrefix(l, "postgres://") || strings.HasPrefix(l, "postgresql://") || strings.Contains(l, "port=5432") {
 \t\treturn DialectPostgres
 \t}
-\tif strings.HasPrefix(l, "sqlite://") || strings.HasPrefix(l, "sqlite:") || strings.HasPrefix(l, "file:") || strings.HasSuffix(l, ".db") || strings.HasSuffix(l, ".sqlite") || strings.HasSuffix(l, ".sqlite3") || l == ":memory:" {
+\tif l == "sqlite" || strings.HasPrefix(l, "sqlite://") || strings.HasPrefix(l, "sqlite:") || strings.HasPrefix(l, "file:") || strings.HasSuffix(l, ".db") || strings.HasSuffix(l, ".sqlite") || strings.HasSuffix(l, ".sqlite3") || l == ":memory:" {
 \t\treturn DialectSqlite
 \t}
 \treturn DialectMssql
@@ -363,6 +363,7 @@ func (c *TableClient[T]) quoteName(name string) string {
 // quoteTable quotes a schema.table name for the dialect.
 func (c *TableClient[T]) quoteTable() string {
 \tparts := strings.Split(c.TableName, ".")
+\tif c.Dialect == DialectSqlite && len(parts) == 2 && strings.EqualFold(parts[0], "dbo") { parts = parts[1:] }
 \tquoted := make([]string, len(parts))
 \tfor i, p := range parts {
 \t\tquoted[i] = c.quoteName(p)
@@ -898,14 +899,14 @@ func (c *TableClient[T]) buildWhereFromStruct(v reflect.Value, argOffset int) (s
 \t\t\tvar subParts []string
 \t\t\tfor j := 0; j < fv.Len(); j++ {
 \t\t\t\tsub, subArgs := c.buildWhereFromStruct(fv.Index(j), argOffset+len(args))
-\t\t\t\tif sub != "" { subParts = append(subParts, sub); args = append(args, subArgs...) }
+\t\t\t\tif sub == "" { sub = "1=1" }; subParts = append(subParts, sub); args = append(args, subArgs...)
 \t\t\t}
-\t\t\tif len(subParts) > 0 { parts = append(parts, "("+strings.Join(subParts, " OR ")+")") }
+\t\t\tif len(subParts) > 0 { parts = append(parts, "("+strings.Join(subParts, " OR ")+")") } else { parts = append(parts, "1=0") }
 \t\t\tcontinue
 \t\t}
 \t\tif name == "NOT" && fv.Kind() == reflect.Ptr && !fv.IsNil() {
 \t\t\tsub, subArgs := c.buildWhereFromStruct(fv.Elem(), argOffset+len(args))
-\t\t\tif sub != "" { parts = append(parts, "NOT ("+sub+")"); args = append(args, subArgs...) }
+\t\t\tif sub == "" { sub = "1=1" }; parts = append(parts, "NOT ("+sub+")"); args = append(args, subArgs...)
 \t\t\tcontinue
 \t\t}
 

package/dist/sql-utils.js

@@ -119,12 +119,17 @@ function parseWhere(modelName, where, params, prefix = "", ctx = {}) {
         }
     }
     for (const [key, value] of Object.entries(cleanWhere)) {
+        if (value === undefined)
+            continue;
         if (key === "OR" && Array.isArray(value)) {
-            const orConditions = value.map((subWhere, idx) => parseWhere(modelName, subWhere, params, `${prefix}or_${idx}_`, ctx));
+            const orConditions = value.map((subWhere, idx) => parseWhere(modelName, subWhere, params, `${prefix}or_${idx}_`, ctx) || "1=1");
             const filtered = orConditions.filter(Boolean);
             if (filtered.length > 0) {
                 conditions.push(`(${filtered.join(" OR ")})`);
             }
+            else {
+                conditions.push("1=0");
+            }
         }
         else if (key === "AND") {
             const andItems = Array.isArray(value) ? value : [value];
@@ -136,10 +141,10 @@ function parseWhere(modelName, where, params, prefix = "", ctx = {}) {
         }
         else if (key === "NOT") {
             const notItems = Array.isArray(value) ? value : [value];
-            const notConditions = notItems.map((subWhere, idx) => parseWhere(modelName, subWhere, params, `${prefix}not_${idx}_`, ctx));
+            const notConditions = notItems.map((subWhere, idx) => parseWhere(modelName, subWhere, params, `${prefix}not_${idx}_`, ctx) || "1=1");
             const filtered = notConditions.filter(Boolean);
             if (filtered.length > 0) {
-                conditions.push(`NOT (${filtered.join(" AND ")})`);
+                conditions.push(`NOT (${filtered.join(" OR ")})`);
             }
         }
         else {

package/generator/src/golang-generator.ts

@@ -296,7 +296,7 @@ func detectDialect(connStr string) Dialect {
 \tif strings.HasPrefix(l, "postgres://") || strings.HasPrefix(l, "postgresql://") || strings.Contains(l, "port=5432") {
 \t\treturn DialectPostgres
 \t}
-\tif strings.HasPrefix(l, "sqlite://") || strings.HasPrefix(l, "sqlite:") || strings.HasPrefix(l, "file:") || strings.HasSuffix(l, ".db") || strings.HasSuffix(l, ".sqlite") || strings.HasSuffix(l, ".sqlite3") || l == ":memory:" {
+\tif l == "sqlite" || strings.HasPrefix(l, "sqlite://") || strings.HasPrefix(l, "sqlite:") || strings.HasPrefix(l, "file:") || strings.HasSuffix(l, ".db") || strings.HasSuffix(l, ".sqlite") || strings.HasSuffix(l, ".sqlite3") || l == ":memory:" {
 \t\treturn DialectSqlite
 \t}
 \treturn DialectMssql
@@ -377,6 +377,7 @@ func (c *TableClient[T]) quoteName(name string) string {
 // quoteTable quotes a schema.table name for the dialect.
 func (c *TableClient[T]) quoteTable() string {
 \tparts := strings.Split(c.TableName, ".")
+\tif c.Dialect == DialectSqlite && len(parts) == 2 && strings.EqualFold(parts[0], "dbo") { parts = parts[1:] }
 \tquoted := make([]string, len(parts))
 \tfor i, p := range parts {
 \t\tquoted[i] = c.quoteName(p)
@@ -918,14 +919,14 @@ func (c *TableClient[T]) buildWhereFromStruct(v reflect.Value, argOffset int) (s
 \t\t\tvar subParts []string
 \t\t\tfor j := 0; j < fv.Len(); j++ {
 \t\t\t\tsub, subArgs := c.buildWhereFromStruct(fv.Index(j), argOffset+len(args))
-\t\t\t\tif sub != "" { subParts = append(subParts, sub); args = append(args, subArgs...) }
+\t\t\t\tif sub == "" { sub = "1=1" }; subParts = append(subParts, sub); args = append(args, subArgs...)
 \t\t\t}
-\t\t\tif len(subParts) > 0 { parts = append(parts, "("+strings.Join(subParts, " OR ")+")") }
+\t\t\tif len(subParts) > 0 { parts = append(parts, "("+strings.Join(subParts, " OR ")+")") } else { parts = append(parts, "1=0") }
 \t\t\tcontinue
 \t\t}
 \t\tif name == "NOT" && fv.Kind() == reflect.Ptr && !fv.IsNil() {
 \t\t\tsub, subArgs := c.buildWhereFromStruct(fv.Elem(), argOffset+len(args))
-\t\t\tif sub != "" { parts = append(parts, "NOT ("+sub+")"); args = append(args, subArgs...) }
+\t\t\tif sub == "" { sub = "1=1" }; parts = append(parts, "NOT ("+sub+")"); args = append(args, subArgs...)
 \t\t\tcontinue
 \t\t}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@an5/orm",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "The lightweight ORM for SQL Server with support for TypeScript, Python, .NET (C#), Go, and Rust.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -47,7 +47,7 @@
     "db:migrate:status": "npx tsx migrate.ts status",
     "release:cli": "npx tsx scripts/release-cli.ts",
     "release": "node scripts/release.js",
-    "test": "npm run typecheck:cli && node test/smoke.test.js && node test/unit.test.js && node test/generator-regressions.test.js && node --test test/config.test.js && node --test test/provider-types.test.js && node --test test/provider-push.test.js && node --test test/provider-push.sqlite.test.js && node --test test/type-kinds.test.js && node --test test/declarations.test.js && node --test test/version-sync.test.js",
+    "test": "npm run typecheck:cli && node test/smoke.test.js && node test/unit.test.js && node test/generator-regressions.test.js && node --test test/config.test.js && node --test test/provider-types.test.js && node --test test/provider-push.test.js && node --test test/provider-push.sqlite.test.js && node --test test/type-kinds.test.js && node --test test/declarations.test.js && node --test test/version-sync.test.js && node --test test/query-semantics.test.js",
     "test:unit": "node test/unit.test.js",
     "test:generator": "npm run generate && node test/generator.test.js",
     "test:generator:regressions": "node test/generator-regressions.test.js",