- fix tests for SQL to run using container

Author: NinjaRocks

.github/workflows/master-build.yml

@@ -62,11 +62,26 @@ jobs:
           --no-build --configuration Release --verbosity normal
           --logger "console;verbosity=normal"
 
-  # ── 3. SQL Server unit tests (no live DB — integration tests filtered out) ────
-  test-sqlserver-unit:
-    name: "Tests — SQL Server (unit only)"
+  # ── 3. SQL Server tests (full suite against SQL Server 2022 in Docker) ─────────
+  test-sqlserver:
+    name: "Tests — SQL Server"
     needs: build
     runs-on: ubuntu-latest
+
+    services:
+      sqlserver:
+        image: mcr.microsoft.com/mssql/server:2022-latest
+        env:
+          ACCEPT_EULA: "Y"
+          MSSQL_SA_PASSWORD: "Pa55w0rd!"
+        ports:
+          - 1433:1433
+        options: >-
+          --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P 'Pa55w0rd!' -No -Q 'SELECT 1'"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+
     steps:
       - uses: actions/checkout@v4
 
@@ -81,11 +96,12 @@ jobs:
       - name: Build (Release)
         run: dotnet build --no-restore --configuration Release
 
-      - name: "Test: ActiveForge.SqlServer.Tests (unit only)"
+      - name: "Test: ActiveForge.SqlServer.Tests"
+        env:
+          SS_ADMIN_CONNSTR: "Server=localhost,1433;Database=master;User Id=sa;Password=Pa55w0rd!;TrustServerCertificate=True"
         run: >
           dotnet test tests/ActiveForge.SqlServer.Tests/ActiveForge.SqlServer.Tests.csproj
           --no-build --configuration Release --verbosity normal
-          --filter "Category!=Integration"
           --logger "console;verbosity=normal"
 
   # ── 4. PostgreSQL integration tests ──────────────────────────────────────────
@@ -132,25 +148,34 @@ jobs:
           --logger "console;verbosity=normal"
 
   # ── 5. MongoDB integration tests ─────────────────────────────────────────────
+  # Transactions require a replica set; service containers can't be started with
+  # --replSet, so we start MongoDB manually and initialise the replica set.
   test-mongodb:
     name: "Tests — MongoDB"
     needs: build
     runs-on: ubuntu-latest
 
-    services:
-      mongodb:
-        image: mongo:7
-        ports:
-          - 27017:27017
-        options: >-
-          --health-cmd "mongosh --eval 'db.adminCommand(\"ping\")' --quiet"
-          --health-interval 10s
-          --health-timeout 10s
-          --health-retries 5
-
     steps:
       - uses: actions/checkout@v4
 
+      - name: Start MongoDB replica set
+        run: |
+          docker run -d --name mongo \
+            -p 27017:27017 \
+            mongo:7 --replSet rs0 --bind_ip_all
+          # Wait for mongod to accept connections
+          for i in $(seq 1 30); do
+            docker exec mongo mongosh --quiet --eval "db.adminCommand('ping')" \
+              && break || sleep 2
+          done
+          # Initialise the single-node replica set
+          docker exec mongo mongosh --quiet --eval "rs.initiate({_id:'rs0',members:[{_id:0,host:'127.0.0.1:27017'}]})"
+          # Wait until the node becomes PRIMARY
+          for i in $(seq 1 20); do
+            STATUS=$(docker exec mongo mongosh --quiet --eval "rs.status().myState")
+            [ "$STATUS" = "1" ] && break || sleep 2
+          done
+
       - name: Setup .NET 8
         uses: actions/setup-dotnet@v4
         with:

tests/ActiveForge.SqlServer.Tests/SqlServerConnectionCrudTests.cs

@@ -37,14 +37,16 @@ public sealed class SqlServerConnectionCrudTests : IDisposable
         private readonly string _dbName =
             $"af_crud_{System.Threading.Interlocked.Increment(ref _counter)}";
 
-        private const string MasterConnStr =
-            @"Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=master;" +
-            "Integrated Security=True;TrustServerCertificate=True";
+        private static string MasterConnStr =>
+            Environment.GetEnvironmentVariable("SS_ADMIN_CONNSTR")
+            ?? @"Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=master;Integrated Security=True;TrustServerCertificate=True";
 
         private string TestConnStr =>
-            $@"Data Source=(localdb)\MSSQLLocalDB;Initial Catalog={_dbName};" +
-            "Integrated Security=True;TrustServerCertificate=True;" +
-            "MultipleActiveResultSets=True";
+            new Microsoft.Data.SqlClient.SqlConnectionStringBuilder(MasterConnStr)
+            {
+                InitialCatalog          = _dbName,
+                MultipleActiveResultSets = true,
+            }.ConnectionString;
 
         private readonly SqlServerConnection _conn;
 

tests/ActiveForge.SqlServer.Tests/SqlServerJoinIntegrationTests.cs

@@ -63,14 +63,16 @@ public sealed class SqlServerJoinIntegrationTests : IDisposable
         private readonly string _dbName =
             $"af_join_{System.Threading.Interlocked.Increment(ref _counter)}";
 
-        private const string MasterConnStr =
-            @"Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=master;" +
-            "Integrated Security=True;TrustServerCertificate=True";
+        private static string MasterConnStr =>
+            Environment.GetEnvironmentVariable("SS_ADMIN_CONNSTR")
+            ?? @"Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=master;Integrated Security=True;TrustServerCertificate=True";
 
         private string TestConnStr =>
-            $@"Data Source=(localdb)\MSSQLLocalDB;Initial Catalog={_dbName};" +
-            "Integrated Security=True;TrustServerCertificate=True;" +
-            "MultipleActiveResultSets=True";
+            new Microsoft.Data.SqlClient.SqlConnectionStringBuilder(MasterConnStr)
+            {
+                InitialCatalog           = _dbName,
+                MultipleActiveResultSets = true,
+            }.ConnectionString;
 
         private readonly SqlServerConnection _conn;
         private int _electronicsId;