Merged in the EF Core 3.1 update MassTransit#1629

src/Persistence/MassTransit.EntityFrameworkCoreIntegration.Tests/AuditStore_Specs.cs → src/Persistence/MassTransit.EntityFrameworkCoreIntegration.Tests/AuditStore/AuditStore_Specs.cs

@@ -10,26 +10,25 @@
 // under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
 // specific language governing permissions and limitations under the License.
-namespace MassTransit.EntityFrameworkCoreIntegration.Tests
+namespace MassTransit.EntityFrameworkCoreIntegration.Tests.AuditStore
 {
     using System.Linq;
-    using System.Reflection;
     using System.Threading.Tasks;
-
+    using Audit;
     using GreenPipes.Util;
-
-    using MassTransit.EntityFrameworkCoreIntegration.Audit;
-    using MassTransit.Testing;
-
     using Microsoft.EntityFrameworkCore;
-
     using NUnit.Framework;
-
+    using Shared;
     using Shouldly;
+    using Testing;
 
 
-    [TestFixture]
-    public class Saving_audit_records_to_the_audit_store
+    [TestFixture(typeof(SqlServerTestDbParameters))]
+    [TestFixture(typeof(SqlServerResiliencyTestDbParameters))]
+    [TestFixture(typeof(PostgresTestDbParameters))]
+    public class Saving_audit_records_to_the_audit_store<T> :
+        EntityFrameworkTestFixture<T, AuditDbContext>
+        where T : ITestDbParameters, new()
     {
         [Test]
         public async Task Should_have_consume_audit_records()
@@ -53,30 +52,21 @@ public async Task CleanAudit()
         }
 
         InMemoryTestHarness _harness;
+        ConsumerTestHarness<TestConsumer> _consumer;
         EntityFrameworkAuditStore _store;
 
         [OneTimeSetUp]
-        public async Task Send_message_to_test_consumer()
+        public async Task SetUp()
         {
-            // add migrations by calling
-            // dotnet ef migrations add --context auditdbcontext --output-dir Migrations\\Audit audit_init
-            DbContextOptionsBuilder<AuditDbContext> optionsBuilder = new DbContextOptionsBuilder<AuditDbContext>().
-                UseSqlServer(LocalDbConnectionStringProvider.GetLocalDbConnectionString(),
-                m =>
-                    {
-                        var executingAssembly = typeof(ContextFactory).GetTypeInfo().Assembly;
-
-                        m.MigrationsAssembly(executingAssembly.GetName().Name);
-                        m.MigrationsHistoryTable("__AuditEFMigrationHistoryAudit");
-                    });
-
-            _store = new EntityFrameworkAuditStore(optionsBuilder.Options, "EfCoreAudit");
-            using (var dbContext = _store.AuditContext)
+            var contextFactory = new AuditContextFactory();
+
+            await using (var context = contextFactory.CreateDbContext(DbContextOptionsBuilder))
             {
-                await dbContext.Database.MigrateAsync();
-                await dbContext.Database.ExecuteSqlCommandAsync("TRUNCATE TABLE EfCoreAudit");
+                await context.Database.MigrateAsync();
             }
 
+            _store = new EntityFrameworkAuditStore(DbContextOptionsBuilder.Options, "EfCoreAudit");
+
             _harness = new InMemoryTestHarness();
             _harness.OnConnectObservers += bus =>
             {
@@ -91,18 +81,24 @@ public async Task Send_message_to_test_consumer()
         }
 
         [OneTimeTearDown]
-        public Task Teardown()
+        public async Task Teardown()
         {
-            return _harness.Stop();
+            await _harness.Stop();
+
+            var contextFactory = new AuditContextFactory();
+
+            await using (var context = contextFactory.CreateDbContext(DbContextOptionsBuilder))
+            {
+                context.Database.EnsureDeleted();
+            }
         }
 
         async Task<int> GetAuditRecords(string contextType)
         {
-            using var dbContext = _store.AuditContext;
-
-            return await dbContext.Set<AuditRecord>()
-                .Where(x => x.ContextType == contextType)
-                .CountAsync();
+            using (var dbContext = this._store.AuditContext)
+                return await dbContext.Set<AuditRecord>()
+                    .Where(x => x.ContextType == contextType)
+                    .CountAsync();
         }
 
 

src/Persistence/MassTransit.EntityFrameworkCoreIntegration.Tests/AuditStore/DataAccess/AuditContextFactory.cs

@@ -0,0 +1,29 @@
+namespace MassTransit.EntityFrameworkCoreIntegration.Tests
+{
+    using System.Reflection;
+
+    using MassTransit.EntityFrameworkCoreIntegration.Audit;
+    using MassTransit.Tests.AutomatonymousIntegration;
+    using Microsoft.EntityFrameworkCore;
+    using Microsoft.EntityFrameworkCore.Design;
+    using Shared;
+
+
+    public class AuditContextFactory : IDesignTimeDbContextFactory<AuditDbContext>
+    {
+        public AuditDbContext CreateDbContext(string[] args)
+        {
+            // used only for database update and migrations. Since IDesignTimeDbContextFactory is icky,
+            // we only support command line tools for SQL Server, so use SQL Server if you need to do
+            // migrations.
+
+            var optionsBuilder = new SqlServerTestDbParameters().GetDbContextOptions(typeof(AuditDbContext));
+            return CreateDbContext(optionsBuilder);
+        }
+
+        public AuditDbContext CreateDbContext(DbContextOptionsBuilder optionsBuilder)
+        {
+            return new AuditDbContext(optionsBuilder.Options, "EfCoreAudit");
+        }
+    }
+}

src/Persistence/MassTransit.EntityFrameworkCoreIntegration.Tests/LocalDbConnectionStringProvider.cs

@@ -1,7 +1,7 @@
 namespace MassTransit.EntityFrameworkCoreIntegration.Tests
 {
     using System;
-    using System.Data.SqlClient;
+    using Microsoft.Data.SqlClient;
 
 
     public static class LocalDbConnectionStringProvider

src/Persistence/MassTransit.EntityFrameworkCoreIntegration.Tests/MassTransit.EntityFrameworkCoreIntegration.Tests.csproj

@@ -13,8 +13,9 @@
 
   <ItemGroup>
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Include="Shouldly" Version="3.0.2" />

src/Persistence/MassTransit.EntityFrameworkCoreIntegration.Tests/Migrations/Audit/20170710143716_audit_init.cs

@@ -5,6 +5,9 @@
 
 namespace MassTransit.EntityFrameworkCoreIntegration.Tests.Migrations.Audit
 {
+    using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+
     public partial class audit_init : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -14,6 +17,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: table => new
                 {
                     AuditRecordId = table.Column<int>(nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
                         .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
                     ContextType = table.Column<string>(nullable: true),
                     ConversationId = table.Column<Guid>(nullable: true),

src/Persistence/MassTransit.EntityFrameworkCoreIntegration.Tests/Migrations/20170710150441_Init.cs → src/Persistence/MassTransit.EntityFrameworkCoreIntegration.Tests/Migrations/Saga/20170710150441_Init.cs

@@ -2,7 +2,7 @@
 
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace MassTransit.EntityFrameworkCoreIntegration.Tests.Migrations
+namespace MassTransit.EntityFrameworkCoreIntegration.Tests.Migrations.Saga
 {
     public partial class Init : Migration
     {

src/Persistence/MassTransit.EntityFrameworkCoreIntegration.Tests/Migrations/SagaDbContextModelSnapshot.cs → src/Persistence/MassTransit.EntityFrameworkCoreIntegration.Tests/Migrations/Saga/SagaDbContextModelSnapshot.cs

@@ -1,14 +1,12 @@
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using MassTransit.EntityFrameworkCoreIntegration;
+namespace MassTransit.EntityFrameworkCoreIntegration.Tests.Migrations.Saga
+{
+    using System;
+    using Microsoft.EntityFrameworkCore;
+    using Microsoft.EntityFrameworkCore.Infrastructure;
+    using Microsoft.EntityFrameworkCore.Metadata;
+    using SimpleSaga.DataAccess;
 
-using MassTransit.Tests.Saga;
 
-namespace MassTransit.EntityFrameworkCoreIntegration.Tests.Migrations
-{
     [DbContext(typeof(SimpleSagaDbContext))]
     partial class SagaDbContextModelSnapshot : ModelSnapshot
     {

src/Persistence/MassTransit.EntityFrameworkCoreIntegration.Tests/Migrations/SagaWithDependency/20171224151458_Init.cs

@@ -12,8 +12,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "SagaInnerDependency",
                 columns: table => new
                 {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                    Id = table.Column<Guid>(nullable: false),
+                    Name = table.Column<string>(nullable: true)
                 },
                 constraints: table =>
                 {
@@ -24,8 +24,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "SagaDependency",
                 columns: table => new
                 {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    SagaInnerDependencyId = table.Column<Guid>(type: "uniqueidentifier", nullable: false)
+                    Id = table.Column<Guid>(nullable: false),
+                    SagaInnerDependencyId = table.Column<Guid>(nullable: false)
                 },
                 constraints: table =>
                 {
@@ -42,11 +42,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "EfCoreSagasWithDepencies",
                 columns: table => new
                 {
-                    CorrelationId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Completed = table.Column<bool>(type: "bit", nullable: false),
-                    DependencyId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Initiated = table.Column<bool>(type: "bit", nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
+                    CorrelationId = table.Column<Guid>(nullable: false),
+                    Completed = table.Column<bool>(nullable: false),
+                    DependencyId = table.Column<Guid>(nullable: false),
+                    Initiated = table.Column<bool>(nullable: false),
+                    Name = table.Column<string>(maxLength: 40, nullable: true)
                 },
                 constraints: table =>
                 {