@an5/adapters 0.2.5 → 0.2.9

package/dotnet/Mssql/MssqlEngine.cs

@@ -1,144 +1,145 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Reflection;
-
-namespace An5Orm
-{
-// ─── MSSQL Engine ──────────────────────────────────────────────────────────
-
-    internal class MssqlEngine : IQueryEngine
-    {
-        public Dialect Dialect => Dialect.Mssql;
-        private readonly string _connectionString;
-        private readonly int _commandTimeout;
-
-        [ThreadStatic] private static System.Data.SqlClient.SqlConnection _txConn;
-        [ThreadStatic] private static System.Data.SqlClient.SqlTransaction _tx;
-
-        public MssqlEngine(string connectionString, int commandTimeout)
-        {
-            _connectionString = connectionString;
-            _commandTimeout = commandTimeout;
-        }
-
-        private System.Data.SqlClient.SqlConnection OpenConnection(out bool isInTransaction)
-        {
-            if (_txConn != null) { isInTransaction = true; return _txConn; }
-            isInTransaction = false;
-            var conn = new System.Data.SqlClient.SqlConnection(_connectionString);
-            conn.Open();
-            return conn;
-        }
-
-        private System.Data.SqlClient.SqlCommand BuildCommand(
-            System.Data.SqlClient.SqlConnection conn, string sql, Dictionary<string, object> parameters)
-        {
-            var cmd = new System.Data.SqlClient.SqlCommand(sql, conn) { CommandTimeout = _commandTimeout };
-            if (_tx != null) cmd.Transaction = _tx;
-            if (parameters != null)
-            {
-                foreach (var kv in parameters)
-                {
-                    var paramName = kv.Key.StartsWith("@") ? kv.Key : "@" + kv.Key;
-                    cmd.Parameters.AddWithValue(paramName, kv.Value ?? DBNull.Value);
-                }
-            }
-            return cmd;
-        }
-
-        public List<Dictionary<string, object>> QueryRaw(string sql, Dictionary<string, object> parameters)
-        {
-            var results = new List<Dictionary<string, object>>();
-            var conn = OpenConnection(out bool isTx);
-            try
-            {
-                using var cmd = BuildCommand(conn, sql, parameters);
-                using var reader = cmd.ExecuteReader();
-                while (reader.Read())
-                {
-                    var row = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
-                    for (int i = 0; i < reader.FieldCount; i++)
-                    {
-                        row[reader.GetName(i)] = reader.IsDBNull(i) ? null : reader.GetValue(i);
-                    }
-                    results.Add(row);
-                }
-            }
-            finally { if (!isTx) conn.Dispose(); }
-            return results;
-        }
-
-        public List<T> QueryRaw<T>(string sql, Dictionary<string, object> parameters) where T : new()
-        {
-            var results = new List<T>();
-            var conn = OpenConnection(out bool isTx);
-            try
-            {
-                using var cmd = BuildCommand(conn, sql, parameters);
-                using var reader = cmd.ExecuteReader();
-                var props = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
-                while (reader.Read())
-                {
-                    var item = new T();
-                    foreach (var prop in props)
-                    {
-                        if (!HasColumn(reader, prop.Name)) continue;
-                        var val = reader[prop.Name];
-                        if (val == DBNull.Value) continue;
-                        try { prop.SetValue(item, Convert.ChangeType(val, prop.PropertyType)); } catch { }
-                    }
-                    results.Add(item);
-                }
-            }
-            finally { if (!isTx) conn.Dispose(); }
-            return results;
-        }
-
-        public int ExecuteRaw(string sql, Dictionary<string, object> parameters)
-        {
-            var conn = OpenConnection(out bool isTx);
-            try
-            {
-                using var cmd = BuildCommand(conn, sql, parameters);
-                return cmd.ExecuteNonQuery();
-            }
-            finally { if (!isTx) conn.Dispose(); }
-        }
-
-        private static bool HasColumn(System.Data.SqlClient.SqlDataReader reader, string name)
-        {
-            for (int i = 0; i < reader.FieldCount; i++)
-                if (reader.GetName(i).Equals(name, StringComparison.OrdinalIgnoreCase)) return true;
-            return false;
-        }
-
-        public An5TransactionBase BeginTransaction()
-        {
-            var conn = new System.Data.SqlClient.SqlConnection(_connectionString);
-            conn.Open();
-            var tx = conn.BeginTransaction();
-            _txConn = conn;
-            _tx = tx;
-            return new MssqlTransaction(conn, tx, () => { _txConn = null; _tx = null; });
-        }
-    }
-
-    internal class MssqlTransaction : An5TransactionBase
-    {
-        private readonly System.Data.SqlClient.SqlConnection _conn;
-        private readonly System.Data.SqlClient.SqlTransaction _tx;
-        private readonly Action _cleanup;
-
-        public MssqlTransaction(System.Data.SqlClient.SqlConnection conn, System.Data.SqlClient.SqlTransaction tx, Action cleanup)
-        {
-            _conn = conn;
-            _tx = tx;
-            _cleanup = cleanup;
-        }
-
-        public override void Commit() { _tx.Commit(); _cleanup(); }
-        public override void Rollback() { _tx.Rollback(); _cleanup(); }
-        public override void Dispose() { _tx.Dispose(); _conn.Dispose(); _cleanup(); }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Reflection;
+using Microsoft.Data.SqlClient;
+
+namespace An5Orm
+{
+// ─── MSSQL Engine ──────────────────────────────────────────────────────────
+
+    internal class MssqlEngine : IQueryEngine
+    {
+        public Dialect Dialect => Dialect.Mssql;
+        private readonly string _connectionString;
+        private readonly int _commandTimeout;
+
+        [ThreadStatic] private static SqlConnection _txConn;
+        [ThreadStatic] private static SqlTransaction _tx;
+
+        public MssqlEngine(string connectionString, int commandTimeout)
+        {
+            _connectionString = connectionString;
+            _commandTimeout = commandTimeout;
+        }
+
+        private SqlConnection OpenConnection(out bool isInTransaction)
+        {
+            if (_txConn != null) { isInTransaction = true; return _txConn; }
+            isInTransaction = false;
+            var conn = new SqlConnection(_connectionString);
+            conn.Open();
+            return conn;
+        }
+
+        private SqlCommand BuildCommand(
+            SqlConnection conn, string sql, Dictionary<string, object> parameters)
+        {
+            var cmd = new SqlCommand(sql, conn) { CommandTimeout = _commandTimeout };
+            if (_tx != null) cmd.Transaction = _tx;
+            if (parameters != null)
+            {
+                foreach (var kv in parameters)
+                {
+                    var paramName = kv.Key.StartsWith("@") ? kv.Key : "@" + kv.Key;
+                    cmd.Parameters.AddWithValue(paramName, kv.Value ?? DBNull.Value);
+                }
+            }
+            return cmd;
+        }
+
+        public List<Dictionary<string, object>> QueryRaw(string sql, Dictionary<string, object> parameters)
+        {
+            var results = new List<Dictionary<string, object>>();
+            var conn = OpenConnection(out bool isTx);
+            try
+            {
+                using var cmd = BuildCommand(conn, sql, parameters);
+                using var reader = cmd.ExecuteReader();
+                while (reader.Read())
+                {
+                    var row = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+                    for (int i = 0; i < reader.FieldCount; i++)
+                    {
+                        row[reader.GetName(i)] = reader.IsDBNull(i) ? null : reader.GetValue(i);
+                    }
+                    results.Add(row);
+                }
+            }
+            finally { if (!isTx) conn.Dispose(); }
+            return results;
+        }
+
+        public List<T> QueryRaw<T>(string sql, Dictionary<string, object> parameters) where T : new()
+        {
+            var results = new List<T>();
+            var conn = OpenConnection(out bool isTx);
+            try
+            {
+                using var cmd = BuildCommand(conn, sql, parameters);
+                using var reader = cmd.ExecuteReader();
+                var props = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
+                while (reader.Read())
+                {
+                    var item = new T();
+                    foreach (var prop in props)
+                    {
+                        if (!HasColumn(reader, prop.Name)) continue;
+                        var val = reader[prop.Name];
+                        if (val == DBNull.Value) continue;
+                        try { prop.SetValue(item, Convert.ChangeType(val, prop.PropertyType)); } catch { }
+                    }
+                    results.Add(item);
+                }
+            }
+            finally { if (!isTx) conn.Dispose(); }
+            return results;
+        }
+
+        public int ExecuteRaw(string sql, Dictionary<string, object> parameters)
+        {
+            var conn = OpenConnection(out bool isTx);
+            try
+            {
+                using var cmd = BuildCommand(conn, sql, parameters);
+                return cmd.ExecuteNonQuery();
+            }
+            finally { if (!isTx) conn.Dispose(); }
+        }
+
+        private static bool HasColumn(SqlDataReader reader, string name)
+        {
+            for (int i = 0; i < reader.FieldCount; i++)
+                if (reader.GetName(i).Equals(name, StringComparison.OrdinalIgnoreCase)) return true;
+            return false;
+        }
+
+        public An5TransactionBase BeginTransaction()
+        {
+            var conn = new SqlConnection(_connectionString);
+            conn.Open();
+            var tx = conn.BeginTransaction();
+            _txConn = conn;
+            _tx = tx;
+            return new MssqlTransaction(conn, tx, () => { _txConn = null; _tx = null; });
+        }
+    }
+
+    internal class MssqlTransaction : An5TransactionBase
+    {
+        private readonly SqlConnection _conn;
+        private readonly SqlTransaction _tx;
+        private readonly Action _cleanup;
+
+        public MssqlTransaction(SqlConnection conn, SqlTransaction tx, Action cleanup)
+        {
+            _conn = conn;
+            _tx = tx;
+            _cleanup = cleanup;
+        }
+
+        public override void Commit() { _tx.Commit(); _cleanup(); }
+        public override void Rollback() { _tx.Rollback(); _cleanup(); }
+        public override void Dispose() { _tx.Dispose(); _conn.Dispose(); _cleanup(); }
+    }
+}

package/dotnet/Postgres/PostgresEngine.cs

@@ -1,121 +1,149 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Reflection;
-
-namespace An5Orm
-{
-// ─── PostgreSQL Engine ─────────────────────────────────────────────────────
-
-    internal class PostgresEngine : IQueryEngine
-    {
-        public Dialect Dialect => Dialect.Postgres;
-        private readonly string _connectionString;
-        private readonly int _commandTimeout;
-
-        public PostgresEngine(string connectionString, int commandTimeout)
-        {
-            _connectionString = connectionString;
-            _commandTimeout = commandTimeout;
-        }
-
-        private Npgsql.NpgsqlConnection OpenConnection()
-        {
-            var conn = new Npgsql.NpgsqlConnection(_connectionString);
-            conn.Open();
-            return conn;
-        }
-
-        private Npgsql.NpgsqlCommand BuildCommand(
-            Npgsql.NpgsqlConnection conn, string sql, Dictionary<string, object> parameters)
-        {
-            var cmd = new Npgsql.NpgsqlCommand(sql, conn) { CommandTimeout = _commandTimeout };
-            if (parameters != null)
-            {
-                foreach (var kv in parameters)
-                {
-                    var paramName = kv.Key.StartsWith("@") ? kv.Key : "@" + kv.Key;
-                    cmd.Parameters.AddWithValue(paramName, kv.Value ?? DBNull.Value);
-                }
-            }
-            return cmd;
-        }
-
-        public List<Dictionary<string, object>> QueryRaw(string sql, Dictionary<string, object> parameters)
-        {
-            var results = new List<Dictionary<string, object>>();
-            using var conn = OpenConnection();
-            using var cmd = BuildCommand(conn, sql, parameters);
-            using var reader = cmd.ExecuteReader();
-            while (reader.Read())
-            {
-                var row = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
-                for (int i = 0; i < reader.FieldCount; i++)
-                {
-                    row[reader.GetName(i)] = reader.IsDBNull(i) ? null : reader.GetValue(i);
-                }
-                results.Add(row);
-            }
-            return results;
-        }
-
-        public List<T> QueryRaw<T>(string sql, Dictionary<string, object> parameters) where T : new()
-        {
-            var results = new List<T>();
-            using var conn = OpenConnection();
-            using var cmd = BuildCommand(conn, sql, parameters);
-            using var reader = cmd.ExecuteReader();
-            var props = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
-            while (reader.Read())
-            {
-                var item = new T();
-                foreach (var prop in props)
-                {
-                    if (!HasColumn(reader, prop.Name)) continue;
-                    var val = reader[prop.Name];
-                    if (val == DBNull.Value) continue;
-                    try { prop.SetValue(item, Convert.ChangeType(val, prop.PropertyType)); } catch { }
-                }
-                results.Add(item);
-            }
-            return results;
-        }
-
-        public int ExecuteRaw(string sql, Dictionary<string, object> parameters)
-        {
-            using var conn = OpenConnection();
-            using var cmd = BuildCommand(conn, sql, parameters);
-            return cmd.ExecuteNonQuery();
-        }
-
-        private static bool HasColumn(Npgsql.NpgsqlDataReader reader, string name)
-        {
-            for (int i = 0; i < reader.FieldCount; i++)
-                if (reader.GetName(i).Equals(name, StringComparison.OrdinalIgnoreCase)) return true;
-            return false;
-        }
-
-        public An5TransactionBase BeginTransaction()
-        {
-            var conn = OpenConnection();
-            var tx = conn.BeginTransaction();
-            return new PostgresTransaction(conn, tx);
-        }
-    }
-
-    internal class PostgresTransaction : An5TransactionBase
-    {
-        private readonly Npgsql.NpgsqlConnection _conn;
-        private readonly Npgsql.NpgsqlTransaction _tx;
-
-        public PostgresTransaction(Npgsql.NpgsqlConnection conn, Npgsql.NpgsqlTransaction tx)
-        {
-            _conn = conn;
-            _tx = tx;
-        }
-
-        public override void Commit() { _tx.Commit(); }
-        public override void Rollback() { _tx.Rollback(); }
-        public override void Dispose() { _tx.Dispose(); _conn.Dispose(); }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Reflection;
+
+namespace An5Orm
+{
+// ─── PostgreSQL Engine ─────────────────────────────────────────────────────
+
+    internal class PostgresEngine : IQueryEngine
+    {
+        public Dialect Dialect => Dialect.Postgres;
+        private readonly string _connectionString;
+        private readonly int _commandTimeout;
+
+        // Same shape as MssqlEngine: while a transaction is open, statements
+        // have to run on its connection and carry its transaction, or they land
+        // outside it and commit/rollback do not cover them.
+        [ThreadStatic] private static Npgsql.NpgsqlConnection _txConn;
+        [ThreadStatic] private static Npgsql.NpgsqlTransaction _tx;
+
+        public PostgresEngine(string connectionString, int commandTimeout)
+        {
+            _connectionString = connectionString;
+            _commandTimeout = commandTimeout;
+        }
+
+        private Npgsql.NpgsqlConnection OpenConnection(out bool isInTransaction)
+        {
+            if (_txConn != null) { isInTransaction = true; return _txConn; }
+            isInTransaction = false;
+            var conn = new Npgsql.NpgsqlConnection(_connectionString);
+            conn.Open();
+            return conn;
+        }
+
+        private Npgsql.NpgsqlCommand BuildCommand(
+            Npgsql.NpgsqlConnection conn, string sql, Dictionary<string, object> parameters)
+        {
+            var cmd = new Npgsql.NpgsqlCommand(sql, conn) { CommandTimeout = _commandTimeout };
+            if (_tx != null) cmd.Transaction = _tx;
+            if (parameters != null)
+            {
+                foreach (var kv in parameters)
+                {
+                    var paramName = kv.Key.StartsWith("@") ? kv.Key : "@" + kv.Key;
+                    cmd.Parameters.AddWithValue(paramName, kv.Value ?? DBNull.Value);
+                }
+            }
+            return cmd;
+        }
+
+        public List<Dictionary<string, object>> QueryRaw(string sql, Dictionary<string, object> parameters)
+        {
+            var results = new List<Dictionary<string, object>>();
+            var conn = OpenConnection(out bool isTx);
+            try
+            {
+                using var cmd = BuildCommand(conn, sql, parameters);
+                using var reader = cmd.ExecuteReader();
+                while (reader.Read())
+                {
+                    var row = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+                    for (int i = 0; i < reader.FieldCount; i++)
+                    {
+                        row[reader.GetName(i)] = reader.IsDBNull(i) ? null : reader.GetValue(i);
+                    }
+                    results.Add(row);
+                }
+            }
+            finally { if (!isTx) conn.Dispose(); }
+            return results;
+        }
+
+        public List<T> QueryRaw<T>(string sql, Dictionary<string, object> parameters) where T : new()
+        {
+            var results = new List<T>();
+            var conn = OpenConnection(out bool isTx);
+            try
+            {
+                using var cmd = BuildCommand(conn, sql, parameters);
+                using var reader = cmd.ExecuteReader();
+                var props = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
+                while (reader.Read())
+                {
+                    var item = new T();
+                    foreach (var prop in props)
+                    {
+                        if (!HasColumn(reader, prop.Name)) continue;
+                        var val = reader[prop.Name];
+                        if (val == DBNull.Value) continue;
+                        try { prop.SetValue(item, Convert.ChangeType(val, prop.PropertyType)); } catch { }
+                    }
+                    results.Add(item);
+                }
+            }
+            finally { if (!isTx) conn.Dispose(); }
+            return results;
+        }
+
+        public int ExecuteRaw(string sql, Dictionary<string, object> parameters)
+        {
+            var conn = OpenConnection(out bool isTx);
+            try
+            {
+                using var cmd = BuildCommand(conn, sql, parameters);
+                return cmd.ExecuteNonQuery();
+            }
+            finally { if (!isTx) conn.Dispose(); }
+        }
+
+        private static bool HasColumn(Npgsql.NpgsqlDataReader reader, string name)
+        {
+            for (int i = 0; i < reader.FieldCount; i++)
+                if (reader.GetName(i).Equals(name, StringComparison.OrdinalIgnoreCase)) return true;
+            return false;
+        }
+
+        public An5TransactionBase BeginTransaction()
+        {
+            if (_txConn != null)
+                throw new InvalidOperationException("A transaction is already open on this thread.");
+            var conn = new Npgsql.NpgsqlConnection(_connectionString);
+            conn.Open();
+            var tx = conn.BeginTransaction();
+            _txConn = conn;
+            _tx = tx;
+            return new PostgresTransaction(conn, tx, () => { _txConn = null; _tx = null; });
+        }
+    }
+
+    internal class PostgresTransaction : An5TransactionBase
+    {
+        private readonly Npgsql.NpgsqlConnection _conn;
+        private readonly Npgsql.NpgsqlTransaction _tx;
+        private readonly Action _cleanup;
+
+        public PostgresTransaction(Npgsql.NpgsqlConnection conn, Npgsql.NpgsqlTransaction tx, Action cleanup)
+        {
+            _conn = conn;
+            _tx = tx;
+            _cleanup = cleanup;
+        }
+
+        public override void Commit() { _tx.Commit(); _cleanup(); }
+        public override void Rollback() { _tx.Rollback(); _cleanup(); }
+        public override void Dispose() { _tx.Dispose(); _conn.Dispose(); _cleanup(); }
+    }
+}