@an5/orm 1.0.9 → 1.1.1

package/generator/src/dotnet-generator.ts

@@ -1,8 +1,13 @@
 import fs from 'fs';
 import path from 'path';
-import { Model, Field, Relation } from './types';
+import { Model, Field, Relation, dottedTableName } from './types';
+import { fieldKind } from './type-kinds';
+import { Provider } from './field-types';
 
 export class DotnetGenerator {
+  /** The database being generated for; decides types like `TIMESTAMP`. */
+  private provider: Provider | undefined;
+
   constructor(private outputDir: string) {
     if (!fs.existsSync(this.outputDir)) {
       fs.mkdirSync(this.outputDir, { recursive: true });
@@ -10,6 +15,8 @@ export class DotnetGenerator {
   }
 
   public generate(models: Model[]) {
+    this.provider = models[0]?.provider;
+
     // 1. Generate individual C# entity class files
     for (const model of models) {
       this.generateEntityClass(model);
@@ -25,13 +32,17 @@ export class DotnetGenerator {
     this.generateConfigClass();
   }
 
-  private getCsFilterType(fieldType: string, isOptional: boolean): string {
-    const lower = fieldType.toLowerCase();
-    if (['datetime', 'datetime2', 'smalldatetime', 'date', 'datetimeoffset'].includes(lower)) return 'DateTimeFilter';
-    if (['bool', 'boolean', 'bit'].includes(lower)) return 'BoolFilter';
-    if (['int', 'integer', 'smallint', 'tinyint', 'number'].includes(lower)) return 'IntFilter';
-    if (['bigint', 'long', 'float', 'real', 'double', 'decimal', 'numeric', 'money', 'smallmoney'].includes(lower)) return 'NumberFilter';
-    return 'StringFilter';
+  private getCsFilterType(field: Field, isOptional: boolean): string {
+    // From the declared type: a DECIMAL column took the integer filter because it
+    // arrived as `number`.
+    switch (fieldKind(field, this.provider)) {
+      case 'date': return 'DateTimeFilter';
+      case 'bool': return 'BoolFilter';
+      case 'int':
+      case 'bigint': return 'IntFilter';
+      case 'float': return 'NumberFilter';
+      default: return 'StringFilter';
+    }
   }
 
   private generateOrmTypes(models: Model[]) {
@@ -108,7 +119,7 @@ namespace An5Orm
 
     for (const model of models) {
       const name = this.capitalize(model.name);
-      const csType = (f: { type: string; isOptional: boolean }) => this.mapType(f.type, f.isOptional);
+      const csType = (f: Field) => this.mapType(f, f.isOptional);
 
       content += `    // ── ${name} ORM Types ──────────────────────────────────────────────────────\n\n`;
 
@@ -119,7 +130,7 @@ namespace An5Orm
       content += `        public List<${name}WhereInput> OR { get; set; }\n`;
       content += `        public ${name}WhereInput NOT { get; set; }\n`;
       for (const f of model.fields) {
-        const ft = this.getCsFilterType(f.type, f.isOptional);
+        const ft = this.getCsFilterType(f, f.isOptional);
         content += `        public ${ft} ${this.capitalize(f.name)} { get; set; }\n`;
       }
       content += `    }\n\n`;
@@ -137,7 +148,7 @@ namespace An5Orm
       content += `    public class ${name}CreateInput\n    {\n`;
       for (const f of model.fields) {
         if (!f.isId) {
-          const ct = this.mapType(f.type, f.isOptional || f.hasDefault);
+          const ct = this.mapType(f, f.isOptional || f.hasDefault);
           content += `        public ${ct} ${this.capitalize(f.name)} { get; set; }\n`;
         }
       }
@@ -148,7 +159,7 @@ namespace An5Orm
       content += `    public class ${name}UpdateInput\n    {\n`;
       for (const f of model.fields) {
         if (!f.isId) {
-          const ut = this.mapType(f.type, true); // always nullable for update
+          const ut = this.mapType(f, true); // always nullable for update
           content += `        public ${ut} ${this.capitalize(f.name)} { get; set; }\n`;
         }
       }
@@ -211,34 +222,39 @@ namespace An5Orm
     fs.writeFileSync(path.join(this.outputDir, 'An5Config.cs'), content);
   }
 
-  private mapType(fieldType: string, isOptional: boolean): string {
-    let csType = 'string';
-    const lowerType = fieldType.toLowerCase();
-
-    if (['int', 'integer', 'smallint', 'tinyint', 'number'].includes(lowerType)) {
-      csType = 'int';
-    } else if (['bigint', 'long'].includes(lowerType)) {
-      csType = 'long';
-    } else if (['float', 'real', 'double'].includes(lowerType)) {
-      csType = 'double';
-    } else if (['decimal', 'numeric', 'money', 'smallmoney'].includes(lowerType)) {
-      csType = 'decimal';
-    } else if (['bool', 'boolean', 'bit'].includes(lowerType)) {
-      csType = 'bool';
-    } else if (['datetime', 'datetime2', 'smalldatetime', 'date'].includes(lowerType)) {
-      csType = 'DateTime';
-    } else if (lowerType === 'datetimeoffset') {
-      csType = 'DateTimeOffset';
-    } else if (lowerType === 'time') {
-      csType = 'TimeSpan';
-    } else if (['guid', 'uuid', 'uniqueidentifier'].includes(lowerType)) {
-      csType = 'Guid';
-    } else if (['bytes', 'binary', 'varbinary', 'image'].includes(lowerType)) {
-      csType = 'byte[]';
-    } else if (['xml', 'hierarchyid', 'geography', 'geometry', 'sysname', 'sql_variant', 'sqlvariant', 'rowversion', 'variant'].includes(lowerType)) {
-      csType = 'string';
-    } else if (fieldType.endsWith('[]')) {
-      csType = 'string';
+  /**
+   * The C# type for a field.
+   *
+   * Driven by the declared type, so a `DECIMAL` column is a `decimal` and a `FLOAT`
+   * one a `double`: both arrived as `number` and took the `int` branch.
+   */
+  private mapType(field: Field, isOptional: boolean): string {
+    let csType: string;
+    switch (fieldKind(field, this.provider)) {
+      case 'int': csType = 'int'; break;
+      case 'bigint': csType = 'long'; break;
+      case 'float': {
+        // `DECIMAL`/`NUMERIC`/`MONEY` are exact and stay `decimal`; a floating
+        // column is a `double`. Both used to arrive as `number` and became `int`.
+        const base = (field.sqlType ?? field.type).replace(/\([^)]*\)/g, '').trim().toUpperCase();
+        csType = ['DECIMAL', 'NUMERIC', 'MONEY', 'SMALLMONEY'].includes(base) ? 'decimal' : 'double';
+        break;
+      }
+      case 'bool': csType = 'bool'; break;
+      case 'date': {
+        const base = (field.sqlType ?? field.type).replace(/\([^)]*\)/g, '').trim().toUpperCase();
+        csType = base === 'DATETIMEOFFSET' ? 'DateTimeOffset' : base === 'TIME' ? 'TimeSpan' : 'DateTime';
+        break;
+      }
+      case 'bytes': csType = 'byte[]'; break;
+      case 'vector': csType = 'float[]'; break;
+      // JSON, XML, geometry and the rest stay strings: they are read as text and a
+      // Guid column is covered by the string case below via its declared name.
+      default: {
+        const base = (field.sqlType ?? field.type).replace(/\([^)]*\)/g, '').trim().toUpperCase();
+        csType = ['GUID', 'UUID', 'UNIQUEIDENTIFIER'].includes(base) ? 'Guid' : 'string';
+        break;
+      }
     }
 
     if (isOptional && csType !== 'string' && !csType.endsWith('[]')) {
@@ -260,7 +276,7 @@ namespace An5Orm.Entities
 
     // Generate fields
     for (const field of model.fields) {
-      const csType = this.mapType(field.type, field.isOptional);
+      const csType = this.mapType(field, field.isOptional);
       content += `        public ${csType} ${this.capitalize(field.name)} { get; set; }\n`;
     }
 
@@ -288,31 +304,138 @@ namespace An5Orm.Entities
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.Common;
 using System.Reflection;
 using System.Text.Json;
-using Microsoft.Data.SqlClient;
 using An5Orm.Entities;
 
 namespace An5Orm
 {
+    /// <summary>SQL dialects this client can talk to.</summary>
+    public enum An5Dialect
+    {
+        Mssql,
+        Postgres,
+        Sqlite
+    }
+
+    /// <summary>
+    /// Picks the ADO.NET provider and rewrites the connection string.
+    ///
+    /// Everything below works against DbConnection/DbCommand rather than the
+    /// SQL Server types, because SqlClient, Npgsql and Sqlite each derive from
+    /// those but share no other members. Only the SQL that differs per dialect
+    /// is branched on.
+    /// </summary>
+    internal static class An5Provider
+    {
+        public static An5Dialect Detect(string connectionString)
+        {
+            var cs = (connectionString ?? "").Trim().ToLowerInvariant();
+            // SQLite first: a bare path or Data Source= would otherwise fall
+            // through to SQL Server.
+            if (cs.StartsWith("sqlite:") || cs.StartsWith("file:") || cs == ":memory:"
+                || cs.Contains("data source=") || cs.Contains("datasource=")
+                || cs.EndsWith(".db") || cs.EndsWith(".sqlite") || cs.EndsWith(".sqlite3"))
+                return An5Dialect.Sqlite;
+            if (cs.StartsWith("postgres://") || cs.StartsWith("postgresql://") || cs.Contains("host="))
+                return An5Dialect.Postgres;
+            return An5Dialect.Mssql;
+        }
+
+        /// <summary>
+        /// Rewrites the accepted SQLite spellings into the one
+        /// Microsoft.Data.Sqlite reads, which is Data Source=.
+        /// </summary>
+        public static string NormalizeSqlite(string connectionString)
+        {
+            var cs = (connectionString ?? "").Trim();
+            if (cs.Length == 0) return "Data Source=:memory:";
+            if (cs.IndexOf("Data Source", StringComparison.OrdinalIgnoreCase) >= 0
+                || cs.IndexOf("DataSource", StringComparison.OrdinalIgnoreCase) >= 0
+                || cs.IndexOf("Mode", StringComparison.OrdinalIgnoreCase) >= 0)
+                return cs;
+            if (cs == ":memory:") return "Data Source=:memory:";
+            if (cs.StartsWith("sqlite://", StringComparison.OrdinalIgnoreCase))
+                return "Data Source=" + cs.Substring("sqlite://".Length);
+            if (cs.StartsWith("sqlite:", StringComparison.OrdinalIgnoreCase))
+                return "Data Source=" + cs.Substring("sqlite:".Length);
+            if (cs.StartsWith("file:", StringComparison.OrdinalIgnoreCase)) return cs;
+            return "Data Source=" + cs;
+        }
+
+        public static DbConnection Open(string connectionString, An5Dialect dialect)
+        {
+            DbConnection conn = dialect switch
+            {
+                An5Dialect.Postgres => new Npgsql.NpgsqlConnection(connectionString),
+                An5Dialect.Sqlite => new Microsoft.Data.Sqlite.SqliteConnection(NormalizeSqlite(connectionString)),
+                _ => new Microsoft.Data.SqlClient.SqlConnection(connectionString)
+            };
+            conn.Open();
+            if (dialect == An5Dialect.Sqlite)
+            {
+                // WAL keeps readers off the writer's back, and SQLite leaves
+                // foreign keys off even when the schema declares them.
+                using var pragma = conn.CreateCommand();
+                pragma.CommandText = "PRAGMA journal_mode=WAL; PRAGMA foreign_keys=ON;";
+                pragma.ExecuteNonQuery();
+            }
+            return conn;
+        }
+
+        /// <summary>
+        /// Adds a parameter. The name is stored without the @ prefix: Npgsql and
+        /// Sqlite treat a leading @ as part of the name, while SqlClient adds it
+        /// back, so stripping it is the only spelling all three agree on.
+        /// </summary>
+        public static DbParameter Bind(DbCommand cmd, string name, object value)
+        {
+            var p = cmd.CreateParameter();
+            p.ParameterName = (name ?? "").TrimStart('@');
+            p.Value = value ?? DBNull.Value;
+            cmd.Parameters.Add(p);
+            return p;
+        }
+
+        /// <summary>Quotes an identifier for the dialect.</summary>
+        public static string Quote(string name, An5Dialect dialect)
+        {
+            if (name.StartsWith("[") || name.StartsWith("\\"")) return name;
+            if (dialect == An5Dialect.Mssql)
+                return "[" + name.Replace("]", "]]") + "]";
+            return "\\"" + name.Replace("\\"", "\\"\\"") + "\\"";
+        }
+
+        /// <summary>Schema-less engines have no dbo prefix on the generated table names.</summary>
+        public static string TableName(string tableName, An5Dialect dialect)
+        {
+            if (dialect != An5Dialect.Sqlite) return tableName;
+            if (tableName.StartsWith("dbo.", StringComparison.OrdinalIgnoreCase))
+                return tableName.Substring(4);
+            return tableName;
+        }
+    }
+
     public class An5DbContext
     {
         public string ConnectionString { get; }
-        
+        public An5Dialect Dialect { get; }
+
         [ThreadStatic]
-        private static SqlConnection _txConn;
+        private static DbConnection _txConn;
         [ThreadStatic]
-        private static SqlTransaction _tx;
+        private static DbTransaction _tx;
 
         public An5DbContext(string connectionString = null)
         {
             ConnectionString = connectionString ?? An5Config.ConnectionString;
+            Dialect = An5Provider.Detect(ConnectionString);
         }
 
         public An5Transaction BeginTransaction()
         {
-            var conn = new SqlConnection(ConnectionString);
-            conn.Open();
+            var conn = An5Provider.Open(ConnectionString, Dialect);
             var tx = conn.BeginTransaction();
             _txConn = conn;
             _tx = tx;
@@ -321,8 +444,8 @@ namespace An5Orm
                 _tx = null;
             });
         }
-        
-        public static SqlConnection GetActiveConnection(string connectionString, out bool isTx)
+
+        public static DbConnection GetActiveConnection(string connectionString, out bool isTx)
         {
             if (_txConn != null)
             {
@@ -330,19 +453,17 @@ namespace An5Orm
                 return _txConn;
             }
             isTx = false;
-            var conn = new SqlConnection(connectionString);
-            conn.Open();
-            return conn;
+            return An5Provider.Open(connectionString, An5Provider.Detect(connectionString));
         }
-        
-        public static SqlTransaction GetActiveTransaction() => _tx;
+
+        public static DbTransaction GetActiveTransaction() => _tx;
 
         // ── Tables / Repositories ──────────────────────────────────────────────
 `;
 
     for (const model of models) {
       const name = this.capitalize(model.name);
-      content += `        public TableClient<${model.name}> ${name}s => new TableClient<${model.name}>(ConnectionString, "${model.schemaName}.${model.tableName}");\n`;
+      content += `        public TableClient<${model.name}> ${name}s => new TableClient<${model.name}>(ConnectionString, "${dottedTableName(model)}");\n`;
       content += `        public TableClient<${model.name}> ${name} => ${name}s;\n`;
     }
 
@@ -350,12 +471,12 @@ namespace An5Orm
 
     public class An5Transaction : IDisposable
     {
-        private readonly SqlConnection _conn;
-        private readonly SqlTransaction _tx;
+        private readonly DbConnection _conn;
+        private readonly DbTransaction _tx;
         private readonly Action _cleanup;
         private bool _completed;
 
-        public An5Transaction(SqlConnection conn, SqlTransaction tx, Action cleanup)
+        public An5Transaction(DbConnection conn, DbTransaction tx, Action cleanup)
         {
             _conn = conn;
             _tx = tx;
@@ -390,16 +511,21 @@ namespace An5Orm
     {
         public string ConnectionString { get; }
         public string TableName { get; }
+        public An5Dialect Dialect { get; }
 
         public TableClient(string connectionString, string tableName)
         {
             ConnectionString = connectionString;
-            TableName = tableName;
+            Dialect = An5Provider.Detect(connectionString);
+            // SQLite has no schemas, so the generated dbo. prefix would be part
+            // of the table name and match nothing.
+            TableName = An5Provider.TableName(tableName, Dialect);
         }
 
-        private SqlCommand CreateCommand(SqlConnection conn, string query)
+        private DbCommand CreateCommand(DbConnection conn, string query)
         {
-            var cmd = new SqlCommand(query, conn);
+            var cmd = conn.CreateCommand();
+            cmd.CommandText = query;
             var activeTx = An5DbContext.GetActiveTransaction();
             if (activeTx != null)
             {
@@ -420,7 +546,7 @@ namespace An5Orm
                     {
                         foreach (var kvp in parameters)
                         {
-                            cmd.Parameters.AddWithValue(kvp.Key.StartsWith("@") ? kvp.Key : "@" + kvp.Key, kvp.Value ?? DBNull.Value);
+                            An5Provider.Bind(cmd, kvp.Key, kvp.Value);
                         }
                     }
 
@@ -437,7 +563,7 @@ namespace An5Orm
                                     var val = reader[prop.Name];
                                     if (val != DBNull.Value)
                                     {
-                                        prop.SetValue(item, val);
+                                        SetValue(prop, item, val);
                                     }
                                 }
                             }
@@ -471,7 +597,7 @@ namespace An5Orm
                     {
                         foreach (var kvp in parameters)
                         {
-                            cmd.Parameters.AddWithValue(kvp.Key.StartsWith("@") ? kvp.Key : "@" + kvp.Key, kvp.Value ?? DBNull.Value);
+                            An5Provider.Bind(cmd, kvp.Key, kvp.Value);
                         }
                     }
 
@@ -488,7 +614,7 @@ namespace An5Orm
                                     var val = reader[prop.Name];
                                     if (val != DBNull.Value)
                                     {
-                                        prop.SetValue(item, val);
+                                        SetValue(prop, item, val);
                                     }
                                 }
                             }
@@ -506,11 +632,19 @@ namespace An5Orm
 
         public T FindFirst(string whereClause = null, Dictionary<string, object> parameters = null)
         {
-            string query = $"SELECT TOP 1 * FROM {TableName}";
+            // TOP goes before the table, LIMIT after the WHERE — appending LIMIT
+            // to the SELECT would put it ahead of the predicate.
+            string query = Dialect == An5Dialect.Mssql
+                ? $"SELECT TOP 1 * FROM {TableName}"
+                : $"SELECT * FROM {TableName}";
             if (!string.IsNullOrEmpty(whereClause))
             {
                 query += $" WHERE {whereClause}";
             }
+            if (Dialect != An5Dialect.Mssql)
+            {
+                query += " LIMIT 1";
+            }
 
             var conn = An5DbContext.GetActiveConnection(ConnectionString, out bool isTx);
             try
@@ -521,7 +655,7 @@ namespace An5Orm
                     {
                         foreach (var kvp in parameters)
                         {
-                            cmd.Parameters.AddWithValue(kvp.Key.StartsWith("@") ? kvp.Key : "@" + kvp.Key, kvp.Value ?? DBNull.Value);
+                            An5Provider.Bind(cmd, kvp.Key, kvp.Value);
                         }
                     }
 
@@ -538,7 +672,7 @@ namespace An5Orm
                                     var val = reader[prop.Name];
                                     if (val != DBNull.Value)
                                     {
-                                        prop.SetValue(item, val);
+                                        SetValue(prop, item, val);
                                     }
                                 }
                             }
@@ -564,7 +698,9 @@ namespace An5Orm
             var properties = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
             var columns = new List<string>();
             var values = new List<string>();
-            var sqlParams = new List<SqlParameter>();
+            // Collected before the command exists; the provider creates the
+            // concrete parameter type, so binding has to wait for the command.
+            var sqlParams = new List<(string Name, object Value)>();
 
             foreach (var prop in properties)
             {
@@ -573,7 +709,7 @@ namespace An5Orm
                 {
                     columns.Add(prop.Name);
                     values.Add("@" + prop.Name);
-                    sqlParams.Add(new SqlParameter("@" + prop.Name, val));
+                    sqlParams.Add((prop.Name, val));
                 }
             }
 
@@ -583,7 +719,7 @@ namespace An5Orm
             {
                 using (var cmd = CreateCommand(conn, query))
                 {
-                    cmd.Parameters.AddRange(sqlParams.ToArray());
+                    foreach (var (name, value) in sqlParams) An5Provider.Bind(cmd, name, value);
                     cmd.ExecuteNonQuery();
                     if (!isTx)
                     {
@@ -602,7 +738,9 @@ namespace An5Orm
         {
             var properties = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
             var sets = new List<string>();
-            var sqlParams = new List<SqlParameter>();
+            // Collected before the command exists; the provider creates the
+            // concrete parameter type, so binding has to wait for the command.
+            var sqlParams = new List<(string Name, object Value)>();
             object idVal = null;
 
             foreach (var prop in properties)
@@ -615,7 +753,7 @@ namespace An5Orm
                 else if (val != null)
                 {
                     sets.Add($"{prop.Name} = @{prop.Name}");
-                    sqlParams.Add(new SqlParameter("@" + prop.Name, val));
+                    sqlParams.Add((prop.Name, val));
                 }
             }
 
@@ -624,14 +762,14 @@ namespace An5Orm
                 throw new InvalidOperationException("Cannot update entity without Id");
             }
 
-            sqlParams.Add(new SqlParameter("@id", idVal));
+            sqlParams.Add(("id", idVal));
             string query = $"UPDATE {TableName} SET {string.Join(", ", sets)} WHERE Id = @id";
             var conn = An5DbContext.GetActiveConnection(ConnectionString, out bool isTx);
             try
             {
                 using (var cmd = CreateCommand(conn, query))
                 {
-                    cmd.Parameters.AddRange(sqlParams.ToArray());
+                    foreach (var (name, value) in sqlParams) An5Provider.Bind(cmd, name, value);
                     cmd.ExecuteNonQuery();
                 }
             }
@@ -650,7 +788,7 @@ namespace An5Orm
             {
                 using (var cmd = CreateCommand(conn, query))
                 {
-                    cmd.Parameters.AddWithValue("@id", id);
+                    An5Provider.Bind(cmd, "id", id);
                     int affected = cmd.ExecuteNonQuery();
                     return affected > 0;
                 }
@@ -673,7 +811,7 @@ namespace An5Orm
                     if (parameters != null)
                     {
                         foreach (var kvp in parameters)
-                            cmd.Parameters.AddWithValue(kvp.Key.StartsWith("@") ? kvp.Key : "@" + kvp.Key, kvp.Value ?? DBNull.Value);
+                            An5Provider.Bind(cmd, kvp.Key, kvp.Value);
                     }
                     var res = cmd.ExecuteScalar();
                     return res != null && res != DBNull.Value ? Convert.ToInt32(res) : 0;
@@ -697,13 +835,15 @@ namespace An5Orm
         {
             if (updateData == null || updateData.Count == 0) return 0;
             var sets = new List<string>();
-            var sqlParams = new List<SqlParameter>();
+            // Bound after the command exists, so the provider can create the
+            // right parameter type; a value tuple carries (name, value) until then.
+            var sqlParams = new List<(string Name, object Value)>();
             int pIndex = 0;
             foreach (var kvp in updateData)
             {
                 string paramName = "@u_" + pIndex++;
                 sets.Add($"{kvp.Key} = {paramName}");
-                sqlParams.Add(new SqlParameter(paramName, kvp.Value ?? DBNull.Value));
+                sqlParams.Add((paramName, kvp.Value));
             }
             string query = $"UPDATE {TableName} SET {string.Join(", ", sets)}";
             if (!string.IsNullOrEmpty(whereClause)) query += $" WHERE {whereClause}";
@@ -712,11 +852,11 @@ namespace An5Orm
             {
                 using (var cmd = CreateCommand(conn, query))
                 {
-                    cmd.Parameters.AddRange(sqlParams.ToArray());
+                    foreach (var (name, value) in sqlParams) An5Provider.Bind(cmd, name, value);
                     if (parameters != null)
                     {
                         foreach (var kvp in parameters)
-                            cmd.Parameters.AddWithValue(kvp.Key.StartsWith("@") ? kvp.Key : "@" + kvp.Key, kvp.Value ?? DBNull.Value);
+                            An5Provider.Bind(cmd, kvp.Key, kvp.Value);
                     }
                     return cmd.ExecuteNonQuery();
                 }
@@ -736,7 +876,7 @@ namespace An5Orm
                     if (parameters != null)
                     {
                         foreach (var kvp in parameters)
-                            cmd.Parameters.AddWithValue(kvp.Key.StartsWith("@") ? kvp.Key : "@" + kvp.Key, kvp.Value ?? DBNull.Value);
+                            An5Provider.Bind(cmd, kvp.Key, kvp.Value);
                     }
                     return cmd.ExecuteNonQuery();
                 }
@@ -756,28 +896,44 @@ namespace An5Orm
 
         public List<T> VectorSearch(List<double> vector, int take = 10, string whereClause = null, Dictionary<string, object> parameters = null, string vectorField = "Embedding", string distanceMetric = "cosine")
         {
-            // 1. Primary path: Native database SQL vector query execution (VECTOR_DISTANCE)
+            // 1. Primary path: native vector query. SQL Server has VECTOR_DISTANCE
+            //    and Postgres has pgvector; SQLite has no vector operator, so it is
+            //    skipped outright rather than issuing SQL that can only fail and
+            //    cost a round trip before falling through.
+            if (Dialect != An5Dialect.Sqlite)
             try
             {
                 var dim = vector.Count;
                 var vecJson = JsonSerializer.Serialize(vector);
-                var sql = $"SELECT TOP ({take}) *, VECTOR_DISTANCE('{distanceMetric}', CAST([{vectorField}] AS VECTOR({dim}, float32)), CAST(@query_vector AS VECTOR({dim}, float32))) AS distance FROM {TableName} WITH (NOLOCK)";
+                var field = An5Provider.Quote(vectorField, Dialect);
+                string sql;
+                if (Dialect == An5Dialect.Postgres)
+                {
+                    var op = distanceMetric.Equals("cosine", StringComparison.OrdinalIgnoreCase) ? "<=>"
+                           : (distanceMetric.Equals("euclidean", StringComparison.OrdinalIgnoreCase) ? "<->" : "<#>");
+                    sql = $"SELECT *, ({field} {op} @query_vector::vector) AS distance FROM {TableName}";
+                }
+                else
+                {
+                    sql = $"SELECT TOP ({take}) *, VECTOR_DISTANCE('{distanceMetric}', CAST({field} AS VECTOR({dim}, float32)), CAST(@query_vector AS VECTOR({dim}, float32))) AS distance FROM {TableName} WITH (NOLOCK)";
+                }
 
                 var p = parameters != null ? new Dictionary<string, object>(parameters) : new Dictionary<string, object>();
                 p["query_vector"] = vecJson;
 
                 if (!string.IsNullOrWhiteSpace(whereClause))
-                    sql += $" WHERE [{vectorField}] IS NOT NULL AND ({whereClause})";
+                    sql += $" WHERE {field} IS NOT NULL AND ({whereClause})";
                 else
-                    sql += $" WHERE [{vectorField}] IS NOT NULL";
+                    sql += $" WHERE {field} IS NOT NULL";
                 sql += " ORDER BY distance ASC";
+                if (Dialect == An5Dialect.Postgres) sql += $" LIMIT {take}";
 
                 var nativeRows = QueryRaw(sql, p);
                 if (nativeRows != null) return nativeRows;
             }
             catch
             {
-                // Fallback to in-memory similarity computation if DB instance lacks native VECTOR_DISTANCE
+                // Fallback to in-memory similarity computation if the database has no native vector support
             }
 
             // 2. Secondary fallback: In-memory similarity computation
@@ -859,7 +1015,40 @@ namespace An5Orm
             return dot / (Math.Sqrt(m1) * Math.Sqrt(m2));
         }
 
-        private bool HasColumn(SqlDataReader reader, string columnName)
+        /// <summary>
+        /// Assigns a column to a property, converting when the provider's CLR
+        /// type does not match the property.
+        ///
+        /// Required across dialects, not just for SQLite: SQLite hands back
+        /// dates as TEXT and every integer as Int64, so a DateTime or int
+        /// property would otherwise fail to set. A value that cannot be
+        /// converted is skipped rather than aborting the whole read.
+        /// </summary>
+        private static void SetValue(System.Reflection.PropertyInfo prop, object target, object value)
+        {
+            var wanted = prop.PropertyType;
+            if (wanted.IsInstanceOfType(value))
+            {
+                prop.SetValue(target, value);
+                return;
+            }
+            try
+            {
+                var underlying = Nullable.GetUnderlyingType(wanted);
+                if (underlying != null && value == null) { prop.SetValue(target, null); return; }
+                if (underlying != null)
+                {
+                    prop.SetValue(target, Convert.ChangeType(value, underlying));
+                    return;
+                }
+                if (value is string text && wanted == typeof(Guid)) { prop.SetValue(target, Guid.Parse(text)); return; }
+                if (value is string when && wanted == typeof(DateTime)) { prop.SetValue(target, DateTime.Parse(when, System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.RoundtripKind)); return; }
+                prop.SetValue(target, Convert.ChangeType(value, wanted));
+            }
+            catch { }
+        }
+
+        private bool HasColumn(DbDataReader reader, string columnName)
         {
             for (int i = 0; i < reader.FieldCount; i++)
             {