Fixed breaking change in EFCore6

Author: koenbeuk

src/EntityFrameworkCore.Triggered/Internal/HybridServiceProvider.cs

@@ -16,16 +16,27 @@ public HybridServiceProvider(IServiceProvider serviceProvider, DbContext dbConte
 
         public object? GetService(Type serviceType)
         {
+#if EFCORETRIGGERED3
+            // Starting from EF Core Triggered v3 we prefer the captured DbContext over our registry
+            if (serviceType.IsAssignableFrom(_dbContext.GetType()))
+            {
+                return _dbContext;
+            }
+#endif
+
             var result = _serviceProvider.GetService(serviceType);
             if (result is not null)
             {
                 return result;
             }
 
+#if EFCORETRIGGERED3
+#else
             if (typeof(DbContext).IsAssignableFrom(serviceType))
             {
                 return _dbContext;
             }
+#endif
 
             return default;
         }

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

@@ -49,6 +49,25 @@ public void ScenarioTests(ScenarioContext scenario)
             });
         }
 
+
+#if EFCORETRIGGERED3
+        [Fact]
+        public void CantOverrideDbContext()
+        {
+            var dbContext1 = new ConcreteCustomDbContext();
+            var dbContext2 = new ConcreteCustomDbContext();
+
+            var serviceProvider = new ServiceCollection()
+                .AddSingleton(dbContext2)
+                .BuildServiceProvider();
+
+            var subject = new HybridServiceProvider(serviceProvider, dbContext1);
+
+            var result = subject.GetRequiredService<ConcreteCustomDbContext>();
+
+            Assert.Equal(dbContext1, result);
+        }
+#else
         [Fact]
         public void CanOverrideDbContext()
         {
@@ -65,6 +84,6 @@ public void CanOverrideDbContext()
 
             Assert.Equal(dbContext2, result);
         }
-
+#endif
     }
 }

test/EntityFrameworkCore.Triggered.Tests/TriggeredDbContextFactoryTests.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace EntityFrameworkCore.Triggered.Tests
+{
+    public class TriggeredDbContextFactoryTests
+    {
+        public class TestModel
+        {
+            public Guid Id { get; set; }
+            public string Name { get; set; }
+        }
+
+        class TestTrigger : IBeforeSaveTrigger<TestModel>
+        {
+            readonly TestDbContext _testDbContext;
+
+            public TestTrigger(TestDbContext testDbContext)
+            {
+                _testDbContext = testDbContext;
+            }
+
+            public Task BeforeSave(ITriggerContext<TestModel> context, CancellationToken cancellationToken)
+            {
+                _testDbContext.TriggerRaised = true;
+                return Task.CompletedTask;
+            }
+        }
+
+#pragma warning disable CS0618 // Type or member is obsolete
+        class TestDbContext : TriggeredDbContext
+#pragma warning restore CS0618 // Type or member is obsolete
+        {
+            public TestDbContext(DbContextOptions options)
+                : base(options)
+            {
+
+            }
+
+            public DbSet<TestModel> TestModels { get; set; }
+
+            public bool TriggerRaised { get; set; } = false;
+        }
+
+        [Fact]
+        public void DbContextFactory_RaisesTrigger_SharesDbContext()
+        {
+            using var serviceProvider = new ServiceCollection()
+                .AddTriggeredDbContextFactory<TestDbContext>(options => {
+                    options.UseInMemoryDatabase(nameof(DbContextFactory_RaisesTrigger_SharesDbContext));
+                    options.UseTriggers(triggerOptions => {
+                        triggerOptions.AddTrigger<TestTrigger>();
+                    });
+                    options.ConfigureWarnings(warningOptions => {
+                        warningOptions.Ignore(CoreEventId.ManyServiceProvidersCreatedWarning);
+                    });
+                })
+                .BuildServiceProvider();
+
+            using var serviceScope = serviceProvider.CreateScope();
+            var dbContextFactory = serviceScope.ServiceProvider.GetService<IDbContextFactory<TestDbContext>>();
+            using var dbContext = dbContextFactory.CreateDbContext();
+
+            dbContext.TestModels.Add(new TestModel { });
+            dbContext.SaveChanges();
+
+            Assert.True(dbContext.TriggerRaised);
+        }
+    }
+}