Fix tests

Author: SebastianStehle

src/PhenX.EntityFrameworkCore.BulkInsert.SqlServer/SqlServerDialectBuilder.cs

@@ -84,6 +84,6 @@ public override string BuildMoveDataSql<T>(DbContext context, string source,
 
     protected override string GetExcludedColumnName(string columnName)
     {
-        return $"SOURCE.{Quote(columnName)}";
+        return $"SOURCE.{columnName}";
     }
 }

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainer.cs

@@ -14,8 +14,6 @@ public abstract class TestDbContainer<TDbContext> : IAsyncLifetime
     private static readonly TimeSpan WaitTime = TimeSpan.FromSeconds(30);
     protected readonly IDatabaseContainer? DbContainer;
 
-    public TDbContext DbContext { get; private set; } = null!;
-
     protected TestDbContainer()
     {
         DbContainer = GetDbContainer();
@@ -36,32 +34,41 @@ public async Task InitializeAsync()
         {
             await DbContainer.StartAsync();
         }
+    }
 
-        DbContext = new TDbContext
+    public async Task<TDbContext> CreateContextAsync()
+    {
+        var dbContext = new TDbContext
         {
             ConfigureOptions = Configure
         };
-        DbContext.Database.SetConnectionString(GetConnectionString());
 
-        await EnsureConnectedAsync();
+        dbContext.Database.SetConnectionString(GetConnectionString());
 
-        await DbContext.Database.EnsureCreatedAsync();
+        await EnsureConnectedAsync(dbContext);
+        try
+        {
+            await dbContext.Database.EnsureCreatedAsync();
+        }
+        catch
+        {
+            // Often fails with SQL server.
+        }
+
+        return dbContext;
     }
 
-    protected virtual async Task EnsureConnectedAsync()
+    protected virtual async Task EnsureConnectedAsync(TDbContext context)
     {
         using var cts = new CancellationTokenSource(WaitTime);
-        while (!await DbContext.Database.CanConnectAsync(cts.Token))
+        while (!await context.Database.CanConnectAsync(cts.Token))
         {
             await Task.Delay(100, cts.Token);
         }
     }
 
     public async Task DisposeAsync()
     {
-        // await DbContext.Database.EnsureDeletedAsync();
-        await DbContext.DisposeAsync();
-
         if (DbContainer != null)
         {
             await DbContainer.DisposeAsync();

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerMySql.cs

@@ -15,6 +15,7 @@ public class TestDbContainerMySql<TDbContext> : TestDbContainer<TDbContext>
     protected override IDatabaseContainer? GetDbContainer()
     {
         return new MySqlBuilder()
+            .WithReuse(true)
             .WithCommand("--log-bin-trust-function-creators=1", "--local-infile=1")
             .Build();
     }

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerPostgreSql.cs

@@ -1,4 +1,4 @@
-using DotNet.Testcontainers.Containers;
+using DotNet.Testcontainers.Containers;
 
 using Microsoft.EntityFrameworkCore;
 
@@ -15,6 +15,7 @@ public class TestDbContainerPostgreSql<TDbContext> : TestDbContainer<TDbContext>
     protected override IDatabaseContainer? GetDbContainer()
     {
         return new PostgreSqlBuilder()
+            .WithReuse(true)
             .WithDatabase("testdb")
             .WithUsername("testuser")
             .WithPassword("testpassword")

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerSqlServer.cs

@@ -1,4 +1,4 @@
-using DotNet.Testcontainers.Containers;
+using DotNet.Testcontainers.Containers;
 
 using Microsoft.EntityFrameworkCore;
 
@@ -14,7 +14,9 @@ public class TestDbContainerSqlServer<TDbContext> : TestDbContainer<TDbContext>
 {
     protected override IDatabaseContainer? GetDbContainer()
     {
-        return new MsSqlBuilder().Build();
+        return new MsSqlBuilder()
+            .WithReuse(true)
+            .Build();
     }
 
     protected override void Configure(DbContextOptionsBuilder optionsBuilder)

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerSqlite.cs

@@ -25,7 +25,7 @@ protected override void Configure(DbContextOptionsBuilder optionsBuilder)
             .UseBulkInsertSqlite();
     }
 
-    protected override Task EnsureConnectedAsync()
+    protected override Task EnsureConnectedAsync(TDbContext context)
     {
         return Task.CompletedTask;
     }

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestEntity.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 using Microsoft.EntityFrameworkCore;
@@ -20,6 +20,9 @@ public class TestEntity
     [Column("some_price")]
     public decimal Price { get; set; }
 
+    [Column("test_run")]
+    public Guid TestRun { get; set; }
+
     [Column("the_identifier")]
     public Guid Identifier { get; set; }
 

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestEntityWithConverters.cs

@@ -14,5 +14,8 @@ public class TestEntityWithConverters
 
     [Column("created_at")]
     public DateTime CreatedAt { get; set; }
+
+    [Column("test_run")]
+    public Guid TestRun { get; set; }
 }