Merge branch 'master' of https://github.com/koenbeuk/EntityFrameworkCore.Triggered

Author: koenbeuk

src/EntityFrameworkCore.Triggered/Internal/TriggeredDbContextFactory.cs

@@ -31,7 +31,7 @@ public TContext CreateDbContext()
             var applicationTriggerServiceProviderAccessor = context.GetService<ApplicationTriggerServiceProviderAccessor>();
             if (applicationTriggerServiceProviderAccessor != null)
             {
-                applicationTriggerServiceProviderAccessor.SetTriggerServiceProvider(_serviceProvider);
+                applicationTriggerServiceProviderAccessor.SetTriggerServiceProvider(new HybridServiceProvider(_serviceProvider, context));
             }
 
             return context;

test/EntityFrameworkCore.Triggered.Tests/Internal/TriggerFactoryTests.cs

@@ -35,14 +35,15 @@ public SampleTrigger2(TriggerFactory triggerFactory)
             public Task BeforeSave(ITriggerContext<object> context, CancellationToken cancellationToken) => throw new NotImplementedException();
         }
 
-        class SampleTrigger3 : IBeforeSaveTrigger<object>
+        class SampleTrigger3<TDbContext> : IBeforeSaveTrigger<object>
+            where TDbContext : DbContext
         {
-            public SampleTrigger3(SampleDbContext3 dbContext)
+            public SampleTrigger3(TDbContext dbContext)
             {
                 DbContext = dbContext;
             }
 
-            public SampleDbContext3 DbContext { get; }
+            public TDbContext DbContext { get; }
 
             public Task BeforeSave(ITriggerContext<object> context, CancellationToken cancellationToken) => throw new NotImplementedException();
         }
@@ -53,7 +54,11 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
             {
                 optionsBuilder
                     .UseInMemoryDatabase(nameof(SampleDbContext3))
-                    .UseTriggers(triggerOptions => triggerOptions.AddTrigger<SampleTrigger3>());
+                    .UseTriggers(triggerOptions => 
+                        triggerOptions
+                            .AddTrigger<SampleTrigger3<SampleDbContext3>>()
+                            .AddTrigger<SampleTrigger3<DbContext>>()
+                    );
                 optionsBuilder.ConfigureWarnings(warningOptions => {
                     warningOptions.Ignore(CoreEventId.ManyServiceProvidersCreatedWarning);
                 });
@@ -111,5 +116,31 @@ public void Resolve_FromInternalServices_GetsConstructedUsingExternalServiceProv
             Assert.NotNull(trigger);
             Assert.Equal(subject, trigger.TriggerFactory);
         }
+
+        [Fact]
+        public void Resolve_FromHybridServices_GetsPasedTheConcreteDbContext()
+        {
+            using var dbContext = new SampleDbContext3();
+            var factory = dbContext.GetService<TriggerFactory>();
+            var serviceProvider = new HybridServiceProvider(dbContext.GetInfrastructure(), dbContext);
+            
+            var trigger = factory.Resolve(serviceProvider, typeof(IBeforeSaveTrigger<object>)).FirstOrDefault() as SampleTrigger3<SampleDbContext3>;
+
+            Assert.NotNull(trigger);
+            Assert.Equal(dbContext, trigger.DbContext);
+        }
+
+        [Fact]
+        public void Resolve_FromHybridServices_GetsPasedTheAbstractDbContext()
+        {
+            using var dbContext = new SampleDbContext3();
+            var factory = dbContext.GetService<TriggerFactory>();
+            var serviceProvider = new HybridServiceProvider(dbContext.GetInfrastructure(), dbContext);
+
+            var trigger = factory.Resolve(serviceProvider, typeof(IBeforeSaveTrigger<object>)).LastOrDefault() as SampleTrigger3<DbContext>;
+
+            Assert.NotNull(trigger);
+            Assert.Equal(dbContext, trigger.DbContext);
+        }
     }
 }