@an5/adapters 0.2.9 → 0.2.10

package/dist/an5Adapter.js

@@ -275,7 +275,8 @@ class An5Adapter {
         else if (forDialect.startsWith('mysql://') || forDialect.startsWith('mariadb://')) {
             this._engineType = 'mysql';
         }
-        else if (forDialect.startsWith('sqlite://')
+        else if (forDialect === ':memory:'
+            || forDialect.startsWith('sqlite:')
             || SQLITE_FILE_SUFFIXES.some((suffix) => forDialect.endsWith(suffix))) {
             this._engineType = 'sqlite';
         }

package/dist/base/sql.js

@@ -68,9 +68,10 @@ function parseWhere(modelName, where, params, dialect, prefix = '', ctx) {
     if (!where)
         return '';
     const conditions = [];
+    const relations = ctx?.relationMap?.[modelName] || {};
     const cleanWhere = {};
     for (const [key, value] of Object.entries(where)) {
-        if (key.includes('_') &&
+        if (key.includes('_') && !relations[key] &&
             value && typeof value === 'object' &&
             !(value instanceof Date) &&
             !isOperatorValue(value)) {
@@ -80,13 +81,13 @@ function parseWhere(modelName, where, params, dialect, prefix = '', ctx) {
             cleanWhere[key] = value;
         }
     }
-    const relations = ctx?.relationMap?.[modelName] || {};
     const colPrefix = ctx?.colPrefix || '';
     for (const [key, value] of Object.entries(cleanWhere)) {
+        if (value === undefined)
+            continue;
         if (key === 'OR' && Array.isArray(value)) {
-            const sub = value.map((v, i) => parseWhere(modelName, v, params, dialect, `${prefix}or_${i}_`, ctx)).filter(Boolean);
-            if (sub.length > 0)
-                conditions.push(`(${sub.join(' OR ')})`);
+            const sub = value.map((v, i) => parseWhere(modelName, v, params, dialect, `${prefix}or_${i}_`, ctx) || '1=1');
+            conditions.push(sub.length > 0 ? `(${sub.join(' OR ')})` : '1=0');
         }
         else if (key === 'AND') {
             const items = Array.isArray(value) ? value : [value];
@@ -96,12 +97,12 @@ function parseWhere(modelName, where, params, dialect, prefix = '', ctx) {
         }
         else if (key === 'NOT') {
             const items = Array.isArray(value) ? value : [value];
-            const sub = items.map((v, i) => parseWhere(modelName, v, params, dialect, `${prefix}not_${i}_`, ctx)).filter(Boolean);
+            const sub = items.map((v, i) => parseWhere(modelName, v, params, dialect, `${prefix}not_${i}_`, ctx) || '1=1');
             if (sub.length > 0)
-                conditions.push(`NOT (${sub.join(' AND ')})`);
+                conditions.push(`NOT (${sub.join(' OR ')})`);
         }
         else if (relations[key] && value && typeof value === 'object') {
-            const clause = buildRelationClause(relations[key], value, modelName, params, dialect, prefix, ctx);
+            const clause = buildRelationClause(relations[key], value, modelName, params, dialect, `${prefix}${key}_`, ctx);
             if (clause)
                 conditions.push(clause);
         }
@@ -220,16 +221,16 @@ function buildRelationClause(relation, value, modelName, params, dialect, prefix
     const parts = [];
     if (isMany) {
         if (value.some !== undefined) {
-            const inner = buildInnerWhere(relation.modelName, value.some === null ? {} : value.some, params, dialect, prefix, ctx, childAlias);
+            const inner = buildInnerWhere(relation.modelName, value.some === null ? {} : value.some, params, dialect, `${prefix}some_`, ctx, childAlias);
             parts.push(buildExists(inner));
         }
         if (value.none !== undefined) {
-            const inner = buildInnerWhere(relation.modelName, value.none === null ? {} : value.none, params, dialect, prefix, ctx, childAlias);
+            const inner = buildInnerWhere(relation.modelName, value.none === null ? {} : value.none, params, dialect, `${prefix}none_`, ctx, childAlias);
             parts.push(`NOT ${buildExists(inner)}`);
         }
         if (value.every !== undefined) {
             // "every" = no related row violates the condition.
-            const inner = buildInnerWhere(relation.modelName, value.every === null ? {} : value.every, params, dialect, prefix, ctx, childAlias);
+            const inner = buildInnerWhere(relation.modelName, value.every === null ? {} : value.every, params, dialect, `${prefix}every_`, ctx, childAlias);
             const negated = inner ? `NOT (${inner})` : '';
             const violated = `EXISTS (SELECT 1 FROM ${childTable} AS ${childAlias} WHERE ${correlation}${negated ? ` AND ${negated}` : ' AND 1=0'})`;
             parts.push(`NOT ${violated}`);
@@ -237,12 +238,12 @@ function buildRelationClause(relation, value, modelName, params, dialect, prefix
     }
     else {
         if (value.is !== undefined) {
-            const inner = buildInnerWhere(relation.modelName, value.is === null ? {} : value.is, params, dialect, prefix, ctx, childAlias);
-            parts.push(buildExists(inner));
+            const inner = buildInnerWhere(relation.modelName, value.is === null ? {} : value.is, params, dialect, `${prefix}is_`, ctx, childAlias);
+            parts.push(value.is === null ? `NOT ${buildExists(inner)}` : buildExists(inner));
         }
         if (value.isNot !== undefined) {
-            const inner = buildInnerWhere(relation.modelName, value.isNot === null ? {} : value.isNot, params, dialect, prefix, ctx, childAlias);
-            parts.push(`NOT ${buildExists(inner)}`);
+            const inner = buildInnerWhere(relation.modelName, value.isNot === null ? {} : value.isNot, params, dialect, `${prefix}isNot_`, ctx, childAlias);
+            parts.push(value.isNot === null ? buildExists(inner) : `NOT ${buildExists(inner)}`);
         }
     }
     return parts.length > 0 ? parts.join(' AND ') : null;

package/dist/googlesheets/helpers.js

@@ -25,9 +25,7 @@ function matchWhere(row, where) {
         if (key.includes('_') &&
             value && typeof value === 'object' &&
             !(value instanceof Date) &&
-            !value.in && !value.contains &&
-            !value.not && !value.gte &&
-            !value.lte && !value.gt && !value.lt) {
+            !['equals', 'in', 'notIn', 'contains', 'startsWith', 'endsWith', 'not', 'gte', 'lte', 'gt', 'lt'].some(op => op in value)) {
             Object.assign(cleanWhere, value);
         }
         else {
@@ -35,13 +33,16 @@ function matchWhere(row, where) {
         }
     }
     for (const [key, value] of Object.entries(cleanWhere)) {
+        if (value === undefined)
+            continue;
         if (key === 'OR' && Array.isArray(value)) {
             if (!value.some((v) => matchWhere(row, v)))
                 return false;
             continue;
         }
-        if (key === 'AND' && Array.isArray(value)) {
-            if (!value.every((v) => matchWhere(row, v)))
+        if (key === 'AND') {
+            const clauses = Array.isArray(value) ? value : [value];
+            if (!clauses.every((v) => matchWhere(row, v)))
                 return false;
             continue;
         }
@@ -65,21 +66,25 @@ function matchWhere(row, where) {
                     if (cellVal === null || cellVal === undefined)
                         return false;
                 }
+                else if (v.not && typeof v.not === 'object' && !(v.not instanceof Date) && !Array.isArray(v.not)) {
+                    if (matchWhere(row, { [key]: v.not }))
+                        return false;
+                }
                 else if (normalize(cellVal) == normalize(v.not))
                     return false;
             }
             if (v.equals !== undefined && normalize(cellVal) != normalize(v.equals))
                 return false;
             if (v.contains !== undefined) {
-                if (!cellVal || !normalize(String(cellVal)).includes(normalize(v.contains)))
+                if (cellVal === null || cellVal === undefined || !normalize(String(cellVal)).includes(normalize(v.contains)))
                     return false;
             }
             if (v.startsWith !== undefined) {
-                if (!cellVal || !normalize(String(cellVal)).startsWith(normalize(v.startsWith)))
+                if (cellVal === null || cellVal === undefined || !normalize(String(cellVal)).startsWith(normalize(v.startsWith)))
                     return false;
             }
             if (v.endsWith !== undefined) {
-                if (!cellVal || !normalize(String(cellVal)).endsWith(normalize(v.endsWith)))
+                if (cellVal === null || cellVal === undefined || !normalize(String(cellVal)).endsWith(normalize(v.endsWith)))
                     return false;
             }
             if (v.gte !== undefined && !(Number(cellVal) >= Number(v.gte)))

package/dist/sqlite/engine.js

@@ -15,7 +15,8 @@ class SqliteEngine {
             throw new Error('better-sqlite3 package is required for SQLite support. Run: npm install better-sqlite3');
         this.filePath = (adapterConfig.connectionString ?? '')
             .replace(/^sqlite:\/\/\//i, '/')
-            .replace(/^sqlite:\/\//i, '');
+            .replace(/^sqlite:\/\//i, '')
+            .replace(/^sqlite:/i, '');
     }
     getDb() {
         if (!this.db)

package/dotnet/Base/Core.cs

@@ -259,40 +259,30 @@ public enum Dialect
             {
                 var key = kv.Key;
                 var value = kv.Value;
-                if (key == "OR" && value is System.Collections.IList orList && orList.Count > 0)
+                if (key == "OR" || key == "AND" || key == "NOT")
                 {
+                    var items = value is System.Collections.IList list
+                        ? list : new object[] { value };
                     var subs = new List<string>();
                     var i = 0;
-                    foreach (var item in orList)
+                    foreach (var item in items)
                     {
                         if (item is Dictionary<string, object> subMap)
                         {
-                            var s = ParseWhere(subMap, parameters, dialect, $"{prefix}or{i++}_");
-                            if (!string.IsNullOrEmpty(s)) subs.Add(s);
+                            var s = ParseWhere(subMap, parameters, dialect, $"{prefix}{key}{i++}_");
+                            subs.Add(string.IsNullOrEmpty(s) ? "1=1" : s);
                         }
                     }
-                    if (subs.Count > 0) conditions.Add("(" + string.Join(" OR ", subs) + ")");
-                    continue;
-                }
-                if (key == "AND" && value is System.Collections.IList andList && andList.Count > 0)
-                {
-                    var subs = new List<string>();
-                    var i = 0;
-                    foreach (var item in andList)
+                    if (subs.Count == 0)
                     {
-                        if (item is Dictionary<string, object> subMap)
-                        {
-                            var s = ParseWhere(subMap, parameters, dialect, $"{prefix}and{i++}_");
-                            if (!string.IsNullOrEmpty(s)) subs.Add(s);
-                        }
+                        if (key == "OR") conditions.Add("1=0");
+                    }
+                    else
+                    {
+                        var joiner = key == "AND" ? " AND " : " OR ";
+                        var negation = key == "NOT" ? "NOT " : "";
+                        conditions.Add(negation + "(" + string.Join(joiner, subs) + ")");
                     }
-                    if (subs.Count > 0) conditions.Add("(" + string.Join(" AND ", subs) + ")");
-                    continue;
-                }
-                if (key == "NOT" && value is Dictionary<string, object> notMap)
-                {
-                    var s = ParseWhere(notMap, parameters, dialect, $"{prefix}not_");
-                    if (!string.IsNullOrEmpty(s)) conditions.Add("NOT (" + s + ")");
                     continue;
                 }
 

package/golang/base/where.go

@@ -80,55 +80,41 @@ func buildWhereRec(where map[string]interface{}, dialect Dialect, args *[]interf
 		value := where[key]
 
 		switch key {
-		case "OR":
-			if list, ok := toSlice(value); ok && len(list) > 0 {
-				var subs []string
-				for i, item := range list {
-					if m, ok := item.(map[string]interface{}); ok && m != nil {
-						if s := buildWhereRec(m, dialect, args, ph, fmt.Sprintf("%sor%d_", prefix, i)); s != "" {
-							subs = append(subs, s)
-						}
-					}
-				}
-				if len(subs) > 0 {
-					conditions = append(conditions, "("+strings.Join(subs, " OR ")+")")
-				}
-				continue
-			}
-		case "AND":
-			if list, ok := toSlice(value); ok && len(list) > 0 {
-				var subs []string
-				for i, item := range list {
-					if m, ok := item.(map[string]interface{}); ok && m != nil {
-						if s := buildWhereRec(m, dialect, args, ph, fmt.Sprintf("%sand%d_", prefix, i)); s != "" {
-							subs = append(subs, s)
-						}
-					}
-				}
-				if len(subs) > 0 {
-					conditions = append(conditions, "("+strings.Join(subs, " AND ")+")")
-				}
-				continue
-			}
-		case "NOT":
+		case "OR", "AND", "NOT":
 			items := value
 			if m, ok := value.(map[string]interface{}); ok {
 				items = []interface{}{m}
 			}
-			if list, ok := toSlice(items); ok && len(list) > 0 {
-				var subs []string
-				for i, item := range list {
-					if m, ok := item.(map[string]interface{}); ok && m != nil {
-						if s := buildWhereRec(m, dialect, args, ph, fmt.Sprintf("%snot%d_", prefix, i)); s != "" {
-							subs = append(subs, s)
-						}
+			list, ok := toSlice(items)
+			if !ok {
+				continue
+			}
+			var subs []string
+			for i, item := range list {
+				if m, ok := item.(map[string]interface{}); ok {
+					s := buildWhereRec(cleanWhere(m), dialect, args, ph, fmt.Sprintf("%s%s%d_", prefix, key, i))
+					if s == "" {
+						s = "1=1"
 					}
+					subs = append(subs, s)
 				}
-				if len(subs) > 0 {
-					conditions = append(conditions, "NOT ("+strings.Join(subs, " AND ")+")")
+			}
+			if len(subs) == 0 {
+				if key == "OR" {
+					conditions = append(conditions, "1=0")
 				}
-				continue
+			} else {
+				joiner := " OR "
+				if key == "AND" {
+					joiner = " AND "
+				}
+				clause := "(" + strings.Join(subs, joiner) + ")"
+				if key == "NOT" {
+					clause = "NOT " + clause
+				}
+				conditions = append(conditions, clause)
 			}
+			continue
 		}
 
 		conditions = append(conditions, buildFieldCondition(key, value, dialect, args, ph, prefix)...)
@@ -171,13 +157,10 @@ func buildFieldCondition(key string, value interface{}, dialect Dialect, args *[
 		case "not":
 			if val == nil {
 				parts = append(parts, col+" IS NOT NULL")
-			} else if nested, ok := val.(map[string]interface{}); ok && !isOperatorMap(val) {
-				if nestedArgs := len(*args); true {
-					nestedCond := buildWhereRec(map[string]interface{}{key: nested}, dialect, args, ph, key+"_not_")
-					_ = nestedArgs
-					if nestedCond != "" {
-						parts = append(parts, "NOT ("+nestedCond+")")
-					}
+			} else if nested, ok := val.(map[string]interface{}); ok {
+				nestedCond := buildWhereRec(map[string]interface{}{key: nested}, dialect, args, ph, key+"_not_")
+				if nestedCond != "" {
+					parts = append(parts, "NOT ("+nestedCond+")")
 				}
 			} else {
 				parts = append(parts, fmt.Sprintf("%s <> %s", col, addArg(val)))
@@ -308,4 +291,4 @@ func BuildOrderBy(orderBy interface{}, dialect Dialect) string {
 		return ""
 	}
 	return "ORDER BY " + strings.Join(parts, ", ")
-}
+}

package/golang/base/where_test.go

@@ -0,0 +1,57 @@
+package base
+
+import (
+	"encoding/json"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"reflect"
+	"testing"
+)
+
+// SQLite is provided by Python's standard library to keep the adapter driver-neutral.
+func TestSharedQueryContract(t *testing.T) {
+	fixtures, err := os.ReadFile(filepath.Join("..", "..", "test", "fixtures", "query-semantics.json"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	var contract struct {
+		Rows  []map[string]interface{} `json:"rows"`
+		Cases []struct {
+			Name  string                 `json:"name"`
+			Where map[string]interface{} `json:"where"`
+			IDs   []int                  `json:"ids"`
+		} `json:"cases"`
+	}
+	if err := json.Unmarshal(fixtures, &contract); err != nil {
+		t.Fatal(err)
+	}
+	python, err := exec.LookPath("python3")
+	if err != nil {
+		t.Fatal("python3 is required for the SQLite query contract")
+	}
+	for _, c := range contract.Cases {
+		t.Run(c.Name, func(t *testing.T) {
+			clause, args := BuildWhere(c.Where, DialectSqlite, func(int) string { return "?" })
+			payload, _ := json.Marshal(map[string]interface{}{"rows": contract.Rows, "clause": clause, "args": args})
+			cmd := exec.Command(python, "-c", `import json,sqlite3,sys
+p=json.loads(sys.argv[1])
+db=sqlite3.connect(':memory:')
+db.execute('CREATE TABLE users (id INTEGER, score INTEGER)')
+db.executemany('INSERT INTO users VALUES (?,?)',[(r['id'],r['score']) for r in p['rows']])
+sql='SELECT id FROM users'+(' WHERE '+p['clause'] if p['clause'] else '')+' ORDER BY id'
+print(json.dumps([r[0] for r in db.execute(sql,p['args'])]))`, string(payload))
+			output, err := cmd.CombinedOutput()
+			if err != nil {
+				t.Fatalf("query failed: %v\n%s", err, output)
+			}
+			var got []int
+			if err := json.Unmarshal(output, &got); err != nil {
+				t.Fatal(err)
+			}
+			if !reflect.DeepEqual(got, c.IDs) {
+				t.Fatalf("got %v, want %v", got, c.IDs)
+			}
+		})
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@an5/adapters",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "Standalone language adapters for AN5 ORM - TypeScript, Python, .NET, Go, Rust, and Google Sheets query execution.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -58,16 +58,16 @@
     "pretest": "npm run build",
     "prepack": "npm run build",
     "build:python": "(python -m build --outdir dist-py || python3 -m build --outdir dist-py)",
-    "test": "node test/unit.test.js && node test/package.test.js && node test/nbase.test.js && node --test test/version-sync.test.js",
+    "test": "node test/unit.test.js && node test/package.test.js && node test/nbase.test.js && node --test test/version-sync.test.js && node --test test/query-semantics.test.js && node test/query-relations.integration.test.js",
     "test:package:smoke": "node scripts/package-smoke.js",
-    "test:integration:live": "node test/live-db.integration.test.js",
-    "test:python": "(python -m compileall python 2>&1 || python3 -m compileall python 2>&1)",
+    "test:integration:live": "node test/live-db.integration.test.js && node test/query-relations.integration.test.js",
+    "test:python": "node scripts/python-tests.js",
     "test:dotnet": "node scripts/dotnet-compile-check.js && node scripts/dotnet-sqlite-smoke.js",
     "test:go": "cd golang && go test ./...",
     "test:rust": "node scripts/rust-compile-check.js"
   },
   "dependencies": {
-    "googleapis": "^134.0.0",
+    "googleapis": "^183.0.0",
     "mssql": "^12.5.5",
     "pg": "^8.13.0"
   },
@@ -79,5 +79,13 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "peerDependencies": {
+    "mysql2": "^3.0.0"
+  },
+  "peerDependenciesMeta": {
+    "mysql2": {
+      "optional": true
+    }
   }
 }

package/python/base/sql.py

@@ -51,10 +51,8 @@ def _parse_where(model_name: str, where: Optional[Dict], params: Dict, dialect:
 
     for key, value in clean_where.items():
         if key == "OR" and isinstance(value, list):
-            sub = [_parse_where(model_name, v, params, dialect, f"{prefix}or{i}_") for i, v in enumerate(value)]
-            sub = [s for s in sub if s]
-            if sub:
-                conditions.append(f"({' OR '.join(sub)})")
+            sub = [_parse_where(model_name, v, params, dialect, f"{prefix}or{i}_") or "1=1" for i, v in enumerate(value)]
+            conditions.append(f"({' OR '.join(sub)})" if sub else "1=0")
         elif key == "AND":
             items = value if isinstance(value, list) else [value]
             sub = [_parse_where(model_name, v, params, dialect, f"{prefix}and{i}_") for i, v in enumerate(items)]
@@ -63,10 +61,9 @@ def _parse_where(model_name: str, where: Optional[Dict], params: Dict, dialect:
                 conditions.append(f"({' AND '.join(sub)})")
         elif key == "NOT":
             items = value if isinstance(value, list) else [value]
-            sub = [_parse_where(model_name, v, params, dialect, f"{prefix}not{i}_") for i, v in enumerate(items)]
-            sub = [s for s in sub if s]
+            sub = [_parse_where(model_name, v, params, dialect, f"{prefix}not{i}_") or "1=1" for i, v in enumerate(items)]
             if sub:
-                conditions.append(f"NOT ({' AND '.join(sub)})")
+                conditions.append(f"NOT ({' OR '.join(sub)})")
         else:
             col = _quote(key, dialect)
             pname = _sanitize_param_name(f"{prefix}{key}")
@@ -196,6 +193,8 @@ def _quote_table(t: str, dialect: str) -> str:
     # correct on MSSQL. Other dialects have to strip it and re-quote, or the
     # previous dialect's brackets follow the name into the new dialect.
     parts = _split_qualified(str(t))
+    if dialect == DIALECT_SQLITE and len(parts) == 2 and _strip_wrapping(_strip_wrapping(parts[0], "[", "]"), '"', '"').lower() == "dbo":
+        parts = parts[1:]
     if not parts:
         parts = [str(t)]
     return ".".join(_quote(p, dialect) for p in parts)

package/rust/src/adapter.rs

@@ -1238,6 +1238,7 @@ mod tests {
 
     #[tokio::test]
     async fn resolves_physical_table() {
+        let _guard = crate::base::metadata::TEST_METADATA_LOCK.lock().unwrap();
         crate::base::set_adapter_metadata(AdapterMetadata {
             model_to_table: HashMap::from([("User".to_string(), "[dbo].[Users]".to_string())]),
             ..Default::default()
@@ -1285,6 +1286,7 @@ mod tests {
 
     #[test]
     fn split_relations_uses_metadata() {
+        let _guard = crate::base::metadata::TEST_METADATA_LOCK.lock().unwrap();
         crate::base::set_adapter_metadata(AdapterMetadata {
             relation_map: HashMap::from([(
                 "Order".to_string(),

package/rust/src/base/dialect.rs

@@ -35,7 +35,11 @@ impl Dialect {
 
     /// Quote a single identifier (column or table part).
     pub fn quote_identifier(&self, name: &str) -> String {
-        let raw = strip_wrapping(strip_wrapping(name, "[", "]"), "\"", "\"");
+        let raw = if name.starts_with('[') && name.ends_with(']') {
+            strip_wrapping(name, "[", "]").replace("]]", "]")
+        } else if name.starts_with('"') && name.ends_with('"') {
+            strip_wrapping(name, "\"", "\"").replace("\"\"", "\"")
+        } else { name.to_string() };
         match self {
             Dialect::Postgres | Dialect::Sqlite => {
                 format!("\"{}\"", raw.replace('"', "\"\""))
@@ -46,15 +50,31 @@ impl Dialect {
 
     /// Quote a possibly schema-qualified table name (`dbo.users`).
     pub fn quote_table(&self, table: &str) -> String {
-        let t = table.trim();
-        // Already quoted by the generator: `[dbo].[User]`.
-        if t.starts_with('[') || t.starts_with('"') {
-            return t.to_string();
+        let mut parts = Vec::new();
+        let mut part = String::new();
+        let mut closing = None;
+        let mut chars = table.trim().chars().peekable();
+        while let Some(ch) = chars.next() {
+            if let Some(close) = closing {
+                part.push(ch);
+                if ch == close {
+                    if chars.peek() == Some(&close) {
+                        part.push(chars.next().unwrap());
+                    } else { closing = None; }
+                }
+            } else if ch == '[' || ch == '"' {
+                closing = Some(if ch == '[' { ']' } else { '"' });
+                part.push(ch);
+            } else if ch == '.' {
+                parts.push(std::mem::take(&mut part));
+            } else { part.push(ch); }
         }
-        t.split('.')
-            .map(|p| self.quote_identifier(p))
-            .collect::<Vec<_>>()
-            .join(".")
+        parts.push(part);
+        if *self == Dialect::Sqlite && parts.len() == 2 {
+            let schema = strip_wrapping(strip_wrapping(parts[0].trim(), "[", "]"), "\"", "\"");
+            if schema.eq_ignore_ascii_case("dbo") { parts.remove(0); }
+        }
+        parts.iter().map(|p| self.quote_identifier(p.trim())).collect::<Vec<_>>().join(".")
     }
 
     /// Positional placeholder: `$N` for Postgres, `?` otherwise.
@@ -133,6 +153,15 @@ pub fn vector_distance(a: &[f64], b: &[f64], metric: &str) -> f64 {
 mod tests {
     use super::*;
 
+    #[test]
+    fn converts_generated_table_names_for_sqlite() {
+        assert_eq!(Dialect::Sqlite.quote_table("[dbo].[users]"), "\"users\"");
+        assert_eq!(Dialect::Sqlite.quote_table("[main].[users]"), "\"main\".\"users\"");
+        assert_eq!(Dialect::Sqlite.quote_table("[dot.name]"), "\"dot.name\"");
+        assert_eq!(Dialect::Postgres.quote_table("[dbo].[a]]b]"), "\"dbo\".\"a]b\"");
+        assert_eq!(Dialect::Mssql.quote_table("[dbo].[a]]b]"), "[dbo].[a]]b]");
+    }
+
     #[test]
     fn detects_dialects() {
         assert_eq!(

package/rust/src/base/metadata.rs

@@ -2,6 +2,9 @@
 //!
 //! Mirrors the Go `an5adapters/base` metadata store.
 
+#[cfg(test)]
+pub(crate) static TEST_METADATA_LOCK: std::sync::Mutex<()> = std::sync::Mutex::new(());
+
 use std::collections::HashMap;
 use std::sync::{OnceLock, RwLock};
 
@@ -123,6 +126,7 @@ mod tests {
     fn resolves_table_with_case_fallback() {
         let mut map = HashMap::new();
         map.insert("User".to_string(), "[dbo].[Users]".to_string());
+        let _guard = TEST_METADATA_LOCK.lock().unwrap();
         set_adapter_metadata(AdapterMetadata {
             model_to_table: map,
             ..Default::default()

package/rust/src/base/where_builder.rs

@@ -44,10 +44,6 @@ fn as_object(v: &Value) -> Option<&Map<String, Value>> {
     }
 }
 
-fn is_list(v: &Value) -> bool {
-    v.is_array()
-}
-
 fn to_list(v: &Value) -> Vec<Value> {
     match v {
         Value::Array(items) => items.clone(),
@@ -113,38 +109,23 @@ fn build_where_rec(
         let value = &where_obj[key];
 
         match key.as_str() {
-            "AND" | "OR" if is_list(value) => {
-                let joiner = if key == "AND" { " AND " } else { " OR " };
+            "AND" | "OR" | "NOT" => {
                 let mut subs: Vec<String> = Vec::new();
                 for item in to_list(value) {
                     if let Some(m) = as_object(&item) {
-                        let s = build_where_rec(m, dialect, args, ph);
-                        if !s.is_empty() {
-                            subs.push(s);
-                        }
+                        let s = build_where_rec(&clean_where(m), dialect, args, ph);
+                        subs.push(if s.is_empty() { "1=1".to_string() } else { s });
                     }
                 }
-                if !subs.is_empty() {
-                    conditions.push(format!("({})", subs.join(joiner)));
-                }
-                continue;
-            }
-            "NOT" => {
-                let mut subs: Vec<String> = Vec::new();
-                for item in to_list(value) {
-                    if let Some(m) = as_object(&item) {
-                        let s = build_where_rec(m, dialect, args, ph);
-                        if !s.is_empty() {
-                            subs.push(s);
-                        }
-                    }
-                }
-                if !subs.is_empty() {
-                    conditions.push(format!("NOT ({})", subs.join(" AND ")));
+                if subs.is_empty() {
+                    if key == "OR" { conditions.push("1=0".to_string()); }
+                } else {
+                    let joiner = if key == "AND" { " AND " } else { " OR " };
+                    let negation = if key == "NOT" { "NOT " } else { "" };
+                    conditions.push(format!("{}({})", negation, subs.join(joiner)));
                 }
                 continue;
             }
-            "AND" | "OR" => continue,
             _ => {}
         }
 

package/typescript/src/an5Adapter.ts

@@ -317,7 +317,8 @@ export class An5Adapter {
     } else if (forDialect.startsWith('mysql://') || forDialect.startsWith('mariadb://')) {
       this._engineType = 'mysql';
     } else if (
-      forDialect.startsWith('sqlite://')
+      forDialect === ':memory:'
+      || forDialect.startsWith('sqlite:')
       || SQLITE_FILE_SUFFIXES.some((suffix) => forDialect.endsWith(suffix))
     ) {
       this._engineType = 'sqlite';

package/typescript/src/base/sql.ts

@@ -88,10 +88,11 @@ export function parseWhere(
   if (!where) return '';
   const conditions: string[] = [];
 
+  const relations = ctx?.relationMap?.[modelName] || {};
   const cleanWhere: Record<string, any> = {};
   for (const [key, value] of Object.entries(where)) {
     if (
-      key.includes('_') &&
+      key.includes('_') && !relations[key] &&
       value && typeof value === 'object' &&
       !(value instanceof Date) &&
       !isOperatorValue(value)
@@ -102,23 +103,23 @@ export function parseWhere(
     }
   }
 
-  const relations = ctx?.relationMap?.[modelName] || {};
   const colPrefix = ctx?.colPrefix || '';
 
   for (const [key, value] of Object.entries(cleanWhere)) {
+    if (value === undefined) continue;
     if (key === 'OR' && Array.isArray(value)) {
-      const sub = value.map((v, i) => parseWhere(modelName, v, params, dialect, `${prefix}or_${i}_`, ctx)).filter(Boolean);
-      if (sub.length > 0) conditions.push(`(${sub.join(' OR ')})`);
+      const sub = value.map((v, i) => parseWhere(modelName, v, params, dialect, `${prefix}or_${i}_`, ctx) || '1=1');
+      conditions.push(sub.length > 0 ? `(${sub.join(' OR ')})` : '1=0');
     } else if (key === 'AND') {
       const items = Array.isArray(value) ? value : [value];
       const sub = items.map((v, i) => parseWhere(modelName, v, params, dialect, `${prefix}and_${i}_`, ctx)).filter(Boolean);
       if (sub.length > 0) conditions.push(`(${sub.join(' AND ')})`);
     } else if (key === 'NOT') {
       const items = Array.isArray(value) ? value : [value];
-      const sub = items.map((v, i) => parseWhere(modelName, v, params, dialect, `${prefix}not_${i}_`, ctx)).filter(Boolean);
-      if (sub.length > 0) conditions.push(`NOT (${sub.join(' AND ')})`);
+      const sub = items.map((v, i) => parseWhere(modelName, v, params, dialect, `${prefix}not_${i}_`, ctx) || '1=1');
+      if (sub.length > 0) conditions.push(`NOT (${sub.join(' OR ')})`);
     } else if (relations[key] && value && typeof value === 'object') {
-      const clause = buildRelationClause(relations[key], value, modelName, params, dialect, prefix, ctx);
+      const clause = buildRelationClause(relations[key], value, modelName, params, dialect, `${prefix}${key}_`, ctx);
       if (clause) conditions.push(clause);
     } else {
       const pname = sanitizeParamName(`${prefix}${key}`);
@@ -203,28 +204,28 @@ function buildRelationClause(
 
   if (isMany) {
     if (value.some !== undefined) {
-      const inner = buildInnerWhere(relation.modelName, value.some === null ? {} : value.some, params, dialect, prefix, ctx, childAlias);
+      const inner = buildInnerWhere(relation.modelName, value.some === null ? {} : value.some, params, dialect, `${prefix}some_`, ctx, childAlias);
       parts.push(buildExists(inner));
     }
     if (value.none !== undefined) {
-      const inner = buildInnerWhere(relation.modelName, value.none === null ? {} : value.none, params, dialect, prefix, ctx, childAlias);
+      const inner = buildInnerWhere(relation.modelName, value.none === null ? {} : value.none, params, dialect, `${prefix}none_`, ctx, childAlias);
       parts.push(`NOT ${buildExists(inner)}`);
     }
     if (value.every !== undefined) {
       // "every" = no related row violates the condition.
-      const inner = buildInnerWhere(relation.modelName, value.every === null ? {} : value.every, params, dialect, prefix, ctx, childAlias);
+      const inner = buildInnerWhere(relation.modelName, value.every === null ? {} : value.every, params, dialect, `${prefix}every_`, ctx, childAlias);
       const negated = inner ? `NOT (${inner})` : '';
       const violated = `EXISTS (SELECT 1 FROM ${childTable} AS ${childAlias} WHERE ${correlation}${negated ? ` AND ${negated}` : ' AND 1=0'})`;
       parts.push(`NOT ${violated}`);
     }
   } else {
     if (value.is !== undefined) {
-      const inner = buildInnerWhere(relation.modelName, value.is === null ? {} : value.is, params, dialect, prefix, ctx, childAlias);
-      parts.push(buildExists(inner));
+      const inner = buildInnerWhere(relation.modelName, value.is === null ? {} : value.is, params, dialect, `${prefix}is_`, ctx, childAlias);
+      parts.push(value.is === null ? `NOT ${buildExists(inner)}` : buildExists(inner));
     }
     if (value.isNot !== undefined) {
-      const inner = buildInnerWhere(relation.modelName, value.isNot === null ? {} : value.isNot, params, dialect, prefix, ctx, childAlias);
-      parts.push(`NOT ${buildExists(inner)}`);
+      const inner = buildInnerWhere(relation.modelName, value.isNot === null ? {} : value.isNot, params, dialect, `${prefix}isNot_`, ctx, childAlias);
+      parts.push(value.isNot === null ? buildExists(inner) : `NOT ${buildExists(inner)}`);
     }
   }
 

package/typescript/src/googlesheets/helpers.ts

@@ -21,9 +21,7 @@ export function matchWhere(row: Record<string, any>, where: any): boolean {
       key.includes('_') &&
       value && typeof value === 'object' &&
       !(value instanceof Date) &&
-      !(value as any).in && !(value as any).contains &&
-      !(value as any).not && !(value as any).gte &&
-      !(value as any).lte && !(value as any).gt && !(value as any).lt
+      !['equals', 'in', 'notIn', 'contains', 'startsWith', 'endsWith', 'not', 'gte', 'lte', 'gt', 'lt'].some(op => op in value)
     ) {
       Object.assign(cleanWhere, value);
     } else {
@@ -32,12 +30,14 @@ export function matchWhere(row: Record<string, any>, where: any): boolean {
   }
 
   for (const [key, value] of Object.entries(cleanWhere)) {
+    if (value === undefined) continue;
     if (key === 'OR' && Array.isArray(value)) {
       if (!value.some((v: any) => matchWhere(row, v))) return false;
       continue;
     }
-    if (key === 'AND' && Array.isArray(value)) {
-      if (!value.every((v: any) => matchWhere(row, v))) return false;
+    if (key === 'AND') {
+      const clauses = Array.isArray(value) ? value : [value];
+      if (!clauses.every((v: any) => matchWhere(row, v))) return false;
       continue;
     }
     if (key === 'NOT') {
@@ -57,17 +57,20 @@ export function matchWhere(row: Record<string, any>, where: any): boolean {
 
       if (v.not !== undefined) {
         if (v.not === null) { if (cellVal === null || cellVal === undefined) return false; }
+        else if (v.not && typeof v.not === 'object' && !(v.not instanceof Date) && !Array.isArray(v.not)) {
+          if (matchWhere(row, { [key]: v.not })) return false;
+        }
         else if (normalize(cellVal) == normalize(v.not)) return false;
       }
       if (v.equals !== undefined && normalize(cellVal) != normalize(v.equals)) return false;
       if (v.contains !== undefined) {
-        if (!cellVal || !normalize(String(cellVal)).includes(normalize(v.contains))) return false;
+        if (cellVal === null || cellVal === undefined || !normalize(String(cellVal)).includes(normalize(v.contains))) return false;
       }
       if (v.startsWith !== undefined) {
-        if (!cellVal || !normalize(String(cellVal)).startsWith(normalize(v.startsWith))) return false;
+        if (cellVal === null || cellVal === undefined || !normalize(String(cellVal)).startsWith(normalize(v.startsWith))) return false;
       }
       if (v.endsWith !== undefined) {
-        if (!cellVal || !normalize(String(cellVal)).endsWith(normalize(v.endsWith))) return false;
+        if (cellVal === null || cellVal === undefined || !normalize(String(cellVal)).endsWith(normalize(v.endsWith))) return false;
       }
       if (v.gte !== undefined && !(Number(cellVal) >= Number(v.gte))) return false;
       if (v.lte !== undefined && !(Number(cellVal) <= Number(v.lte))) return false;

package/typescript/src/sqlite/engine.ts

@@ -14,7 +14,8 @@ export class SqliteEngine implements QueryEngine {
     if (!BetterSqlite3) throw new Error('better-sqlite3 package is required for SQLite support. Run: npm install better-sqlite3');
     this.filePath = (adapterConfig.connectionString ?? '')
       .replace(/^sqlite:\/\/\//i, '/')
-      .replace(/^sqlite:\/\//i, '');
+      .replace(/^sqlite:\/\//i, '')
+      .replace(/^sqlite:/i, '');
   }
 
   private getDb(): any {