use hashed createscript as a stable name for the database

Barsonax · Apr 5, 2024 · ea4ad02 · ea4ad02
1 parent d347e27
commit ea4ad02
Show file tree

Hide file tree

Showing 24 changed files with 94 additions and 84 deletions.
diff --git a/Examples/AngularAuth/AngularAuth.Backend.Sut/BloggingContext.cs b/Examples/AngularAuth/AngularAuth.Backend.Sut/BloggingContext.cs
@@ -4,15 +4,20 @@ namespace AngularAuth.Backend.Sut;
 
 public class BloggingContext : DbContext
 {
+    private readonly string? _connectionString;
     public DbSet<Blog> Blogs => Set<Blog>();
     public DbSet<Post> Posts => Set<Post>();
 
-    public BloggingContext()
+    public BloggingContext() { }
+
+    public BloggingContext(IConfiguration configuration)
     {
+        _connectionString = configuration["DbConnectionString"];
     }
 
-    public BloggingContext(DbContextOptions<BloggingContext> context) : base(context)
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
+        optionsBuilder.UseNpgsql(_connectionString);
     }
 }
 

diff --git a/Examples/AngularAuth/AngularAuth.Backend.Sut/Program.cs b/Examples/AngularAuth/AngularAuth.Backend.Sut/Program.cs
@@ -8,10 +8,7 @@
     WebRootPath = "wwwroot/browser"
 });
 
-builder.Services.AddDbContext<BloggingContext>(options =>
-{
-    options.UseNpgsql(builder.Configuration["DbConnectionString"]);
-});
+builder.Services.AddDbContext<BloggingContext>();
 
 builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
     .AddJwtBearer(JwtBearerDefaults.AuthenticationScheme);

diff --git a/Examples/Api/MsSql/Api.MsSql.Sut/BloggingContext.cs b/Examples/Api/MsSql/Api.MsSql.Sut/BloggingContext.cs
@@ -4,17 +4,20 @@ namespace Api.MsSql.Sut;
 
 public class BloggingContext : DbContext
 {
+    private readonly string? _connectionString;
     public DbSet<Blog> Blogs => Set<Blog>();
     public DbSet<Post> Posts => Set<Post>();
 
-    public BloggingContext()
-    {
+    public BloggingContext() { }
 
+    public BloggingContext(IConfiguration configuration)
+    {
+        _connectionString = configuration["DbConnectionString"];
     }
 
-    public BloggingContext(DbContextOptions<BloggingContext> context) : base(context)
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
-
+        optionsBuilder.UseSqlServer(_connectionString);
     }
 }
 

diff --git a/Examples/Api/MsSql/Api.MsSql.Sut/Program.cs b/Examples/Api/MsSql/Api.MsSql.Sut/Program.cs
@@ -3,10 +3,7 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-builder.Services.AddDbContext<BloggingContext>(options =>
-{
-    options.UseSqlServer(builder.Configuration["DbConnectionString"]);
-});
+builder.Services.AddDbContext<BloggingContext>();
 
 var app = builder.Build();
 

diff --git a/Examples/Api/PostgreSql/Api.PostgreSql.Sut/BloggingContext.cs b/Examples/Api/PostgreSql/Api.PostgreSql.Sut/BloggingContext.cs
@@ -4,15 +4,20 @@ namespace Api.PostgreSql.Sut;
 
 public class BloggingContext : DbContext
 {
+    private readonly string? _connectionString;
     public DbSet<Blog> Blogs => Set<Blog>();
     public DbSet<Post> Posts => Set<Post>();
 
-    public BloggingContext()
+    public BloggingContext() { }
+
+    public BloggingContext(IConfiguration configuration)
     {
+        _connectionString = configuration["DbConnectionString"];
     }
 
-    public BloggingContext(DbContextOptions<BloggingContext> context) : base(context)
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
+        optionsBuilder.UseNpgsql(_connectionString);
     }
 }
 

diff --git a/Examples/Api/PostgreSql/Api.PostgreSql.Sut/Program.cs b/Examples/Api/PostgreSql/Api.PostgreSql.Sut/Program.cs
@@ -3,10 +3,7 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-builder.Services.AddDbContext<BloggingContext>(options =>
-{
-    options.UseNpgsql(builder.Configuration["DbConnectionString"]);
-});
+builder.Services.AddDbContext<BloggingContext>();
 
 var app = builder.Build();
 

diff --git a/Examples/ApiJwtAuth/ApiJwtAuth.Sut/BloggingContext.cs b/Examples/ApiJwtAuth/ApiJwtAuth.Sut/BloggingContext.cs
@@ -4,15 +4,20 @@ namespace ApiJwtAuth.Sut;
 
 public class BloggingContext : DbContext
 {
+    private readonly string? _connectionString;
     public DbSet<Blog> Blogs => Set<Blog>();
     public DbSet<Post> Posts => Set<Post>();
 
-    public BloggingContext()
+    public BloggingContext() { }
+
+    public BloggingContext(IConfiguration configuration)
     {
+        _connectionString = configuration["DbConnectionString"];
     }
 
-    public BloggingContext(DbContextOptions<BloggingContext> context) : base(context)
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
+        optionsBuilder.UseNpgsql(_connectionString);
     }
 }
 

diff --git a/Examples/ApiJwtAuth/ApiJwtAuth.Sut/Program.cs b/Examples/ApiJwtAuth/ApiJwtAuth.Sut/Program.cs
@@ -10,10 +10,7 @@
 
 builder.Services.AddAuthorization();
 
-builder.Services.AddDbContext<BloggingContext>(options =>
-{
-    options.UseNpgsql(builder.Configuration["DbConnectionString"]);
-});
+builder.Services.AddDbContext<BloggingContext>();
 
 var app = builder.Build();
 

diff --git a/...ns.MsSql.EntityFrameworkCore/Migrations.MsSql.EntityFrameworkCore.Nunit/MigrationTests.cs b/...ns.MsSql.EntityFrameworkCore/Migrations.MsSql.EntityFrameworkCore.Nunit/MigrationTests.cs
@@ -49,7 +49,7 @@ private sealed class MigrationTestCases : IEnumerable
     {
         public IEnumerator GetEnumerator()
         {
-            using DbContext context = new BloggingContext(new DbContextOptionsBuilder<BloggingContext>().UseSqlServer().Options);
+            using DbContext context = new BloggingContext();
             var migrations = context.GenerateMigrationScripts();
 
             foreach (var migration in migrations)

diff --git a/...ons.MsSql.EntityFrameworkCore/Migrations.MsSql.EntityFrameworkCore.Sut/BloggingContext.cs b/...ons.MsSql.EntityFrameworkCore/Migrations.MsSql.EntityFrameworkCore.Sut/BloggingContext.cs
@@ -4,17 +4,20 @@ namespace Migrations.MsSql.EntityFrameworkCore.Sut;
 
 public class BloggingContext : DbContext
 {
+    private readonly string? _connectionString;
     public DbSet<Blog> Blogs => Set<Blog>();
     public DbSet<Post> Posts => Set<Post>();
 
-    public BloggingContext()
-    {
+    public BloggingContext() { }
 
+    public BloggingContext(IConfiguration configuration)
+    {
+        _connectionString = configuration["DbConnectionString"];
     }
 
-    public BloggingContext(DbContextOptions<BloggingContext> context) : base(context)
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
-
+        optionsBuilder.UseSqlServer(_connectionString);
     }
 }
 

diff --git a/.../Migrations.MsSql.EntityFrameworkCore/Migrations.MsSql.EntityFrameworkCore.Sut/Program.cs b/.../Migrations.MsSql.EntityFrameworkCore/Migrations.MsSql.EntityFrameworkCore.Sut/Program.cs
@@ -3,10 +3,7 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-builder.Services.AddDbContext<BloggingContext>(options =>
-{
-    options.UseSqlServer(builder.Configuration["DbConnectionString"]);
-});
+builder.Services.AddDbContext<BloggingContext>();
 
 var app = builder.Build();
 

diff --git a/Examples/Razor/Razor.Sut/BloggingContext.cs b/Examples/Razor/Razor.Sut/BloggingContext.cs
@@ -4,15 +4,20 @@ namespace Razor.PostgreSql.Sut;
 
 public class BloggingContext : DbContext
 {
+    private readonly string? _connectionString;
     public DbSet<Blog> Blogs => Set<Blog>();
     public DbSet<Post> Posts => Set<Post>();
 
-    public BloggingContext()
+    public BloggingContext() { }
+
+    public BloggingContext(IConfiguration configuration)
     {
+        _connectionString = configuration["DbConnectionString"];
     }
 
-    public BloggingContext(DbContextOptions<BloggingContext> context) : base(context)
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
+        optionsBuilder.UseNpgsql(_connectionString);
     }
 }
 

diff --git a/Examples/Razor/Razor.Sut/Program.cs b/Examples/Razor/Razor.Sut/Program.cs
@@ -3,10 +3,7 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-builder.Services.AddDbContext<BloggingContext>(options =>
-{
-    options.UseNpgsql(builder.Configuration["DbConnectionString"]);
-});
+builder.Services.AddDbContext<BloggingContext>();
 
 builder.Services.AddRazorPages();
 

diff --git a/Examples/Vue/Vue.Backend.Sut/BloggingContext.cs b/Examples/Vue/Vue.Backend.Sut/BloggingContext.cs
@@ -4,15 +4,20 @@ namespace Vue.Backend.Sut;
 
 public class BloggingContext : DbContext
 {
+    private readonly string? _connectionString;
     public DbSet<Blog> Blogs => Set<Blog>();
     public DbSet<Post> Posts => Set<Post>();
 
-    public BloggingContext()
+    public BloggingContext() { }
+
+    public BloggingContext(IConfiguration configuration)
     {
+        _connectionString = configuration["DbConnectionString"];
     }
 
-    public BloggingContext(DbContextOptions<BloggingContext> context) : base(context)
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
+        optionsBuilder.UseNpgsql(_connectionString);
     }
 }
 

diff --git a/Examples/Vue/Vue.Backend.Sut/Program.cs b/Examples/Vue/Vue.Backend.Sut/Program.cs
@@ -3,10 +3,7 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-builder.Services.AddDbContext<BloggingContext>(options =>
-{
-    options.UseNpgsql(builder.Configuration["DbConnectionString"]);
-});
+builder.Services.AddDbContext<BloggingContext>();
 
 var app = builder.Build();
 

diff --git a/TestExamplesDotnet.EntityFrameworkCore/DataBaseNameGenerator.cs b/TestExamplesDotnet.EntityFrameworkCore/DataBaseNameGenerator.cs
diff --git a/TestExamplesDotnet.EntityFrameworkCore/DbContextMigrationInitializer.cs b/TestExamplesDotnet.EntityFrameworkCore/DbContextMigrationInitializer.cs
@@ -1,14 +1,35 @@
-using Microsoft.EntityFrameworkCore;
+using System.Reflection;
+using System.Security.Cryptography;
+using System.Text;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
+
 namespace TestExamplesDotnet;
 
 public sealed class DbContextMigrationInitializer<TDbContext> : IDatabaseInitializer
-    where TDbContext : DbContext
+    where TDbContext : DbContext, new()
 {
+    private int _counter;
+    private readonly Lazy<string> _databaseHash;
+
+    public DbContextMigrationInitializer()
+    {
+        _databaseHash = new Lazy<string>(() =>
+        {
+            using var context = new TDbContext();
+            var createScript = context.GetService<IRelationalDatabaseCreator>().GenerateCreateScript();
+#pragma warning disable CA5351
+            return Convert.ToHexString(MD5.HashData(Encoding.UTF8.GetBytes(createScript)));
+#pragma warning restore CA5351
+        });
+    }
+
     public void Initialize(IHost app)
     {
         using var serviceScope = app.Services.GetRequiredService<IServiceScopeFactory>().CreateScope();
@@ -21,4 +42,10 @@ public void Initialize(IHost app)
         configurationRoot["Logging:LogLevel:Microsoft.EntityFrameworkCore"] = LogLevel.Information.ToString();
         configurationRoot.Reload();
     }
+
+    public string GetUniqueDataBaseName()
+    {
+        var counter = Interlocked.Increment(ref _counter);
+        return $"{_databaseHash.Value}_{counter}";
+    }
 }
diff --git a/TestExamplesDotnet.EntityFrameworkCore/ServiceCollectionExtensions.cs b/TestExamplesDotnet.EntityFrameworkCore/ServiceCollectionExtensions.cs
@@ -6,9 +6,8 @@ namespace TestExamplesDotnet.EntityFrameworkCore;
 public static class ServiceCollectionExtensions
 {
     public static void RegisterMigrationInitializer<TContext>(this IServiceCollection services)
-        where TContext : DbContext
+        where TContext : DbContext, new()
     {
-        services.AddTransient<IDatabaseInitializer, DbContextMigrationInitializer<TContext>>();
-        services.AddSingleton<IDataBaseNameGenerator, DataBaseNameGenerator<TContext>>();
+        services.AddSingleton<IDatabaseInitializer, DbContextMigrationInitializer<TContext>>();
     }
 }
diff --git a/TestExamplesDotnet.Mssql/MsSqlDatabase.cs b/TestExamplesDotnet.Mssql/MsSqlDatabase.cs
@@ -18,7 +18,7 @@ public MsSqlDatabase(MsSqlContainer container, IDatabaseInitializer databaseInit
     {
         _databaseInitializer = databaseInitializer;
         _respawnerOptions = respawnerOptions;
-        ConnectionString = $"Server=127.0.0.1,{container.GetMappedPublicPort(1433)};Database={Guid.NewGuid()};User Id=sa;Password=yourStrong(!)Password;TrustServerCertificate=True";
+        ConnectionString = $"Server=127.0.0.1,{container.GetMappedPublicPort(1433)};Database={databaseInitializer.GetUniqueDataBaseName()};User Id=sa;Password=yourStrong(!)Password;TrustServerCertificate=True";
     }
 
     public void Initialize(IHost host)

diff --git a/TestExamplesDotnet.Mssql/MsSqlDatabasePoolPolicy.cs b/TestExamplesDotnet.Mssql/MsSqlDatabasePoolPolicy.cs
@@ -10,7 +10,6 @@ public sealed class MsSqlDatabasePoolPolicy : IPooledObjectPolicy<IDatabase>
     private readonly IDatabaseInitializer _databaseInitializer;
     private readonly RespawnerOptions _respawnerOptions;
 
-
     public MsSqlDatabasePoolPolicy(MsSqlContainer container, IDatabaseInitializer databaseInitializer, RespawnerOptions respawnerOptions)
     {
         _container = container;

diff --git a/TestExamplesDotnet.PostgreSql/PostgreSqlDatabase.cs b/TestExamplesDotnet.PostgreSql/PostgreSqlDatabase.cs
@@ -13,11 +13,11 @@ public sealed class PostgreSqlDatabase : IDatabase
     private bool _initialized;
     public string ConnectionString { get; }
 
-    public PostgreSqlDatabase(PostgreSqlContainer container, IDatabaseInitializer databaseInitializer, RespawnerOptions respawnerOptions, IDataBaseNameGenerator dataBaseNameGenerator)
+    public PostgreSqlDatabase(PostgreSqlContainer container, IDatabaseInitializer databaseInitializer, RespawnerOptions respawnerOptions)
     {
         _databaseInitializer = databaseInitializer;
         _respawnerOptions = respawnerOptions;
-        ConnectionString = $"Host=127.0.0.1;Port={container.GetMappedPublicPort(5432)};Database={dataBaseNameGenerator.GetDataBaseName()};Username=postgres;Password=postgres;Include Error Detail=true";
+        ConnectionString = $"Host=127.0.0.1;Port={container.GetMappedPublicPort(5432)};Database={databaseInitializer.GetUniqueDataBaseName()};Username=postgres;Password=postgres;Include Error Detail=true";
     }
 
     public void Initialize(IHost host)

diff --git a/TestExamplesDotnet.PostgreSql/PostgreSqlDatabasePoolPolicy.cs b/TestExamplesDotnet.PostgreSql/PostgreSqlDatabasePoolPolicy.cs
@@ -9,18 +9,15 @@ public sealed class PostgreSqlDatabasePoolPolicy : IPooledObjectPolicy<IDatabase
     private readonly PostgreSqlContainer _container;
     private readonly IDatabaseInitializer _databaseInitializer;
     private readonly RespawnerOptions _respawnerOptions;
-    private readonly IDataBaseNameGenerator _dataBaseNameGenerator;
 
-
-    public PostgreSqlDatabasePoolPolicy(PostgreSqlContainer container, IDatabaseInitializer databaseInitializer, RespawnerOptions respawnerOptions, IDataBaseNameGenerator dataBaseNameGenerator)
+    public PostgreSqlDatabasePoolPolicy(PostgreSqlContainer container, IDatabaseInitializer databaseInitializer, RespawnerOptions respawnerOptions)
     {
         _container = container;
         _databaseInitializer = databaseInitializer;
         _respawnerOptions = respawnerOptions;
-        _dataBaseNameGenerator = dataBaseNameGenerator;
     }
 
-    public IDatabase Create() => new PostgreSqlDatabase(_container, _databaseInitializer, _respawnerOptions, _dataBaseNameGenerator);
+    public IDatabase Create() => new PostgreSqlDatabase(_container, _databaseInitializer, _respawnerOptions);
 
     public bool Return(IDatabase obj) => true;
 }
diff --git a/TestExamplesDotnet/IDataBaseNameGenerator.cs b/TestExamplesDotnet/IDataBaseNameGenerator.cs