Merge pull request #14 from koenbeuk/fixed-recursive-triggers

koenbeuk · web-flow · commit 7d6b2f6d1697 · 2020-07-30T15:44:23.000+08:00
Fixed recursive triggers
diff --git a/samples/1 - HelloWorld/1 - HelloWorld.csproj b/samples/1 - HelloWorld/1 - HelloWorld.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EntityFrameworkCore.Triggered" Version="0.2.0" />
+    <PackageReference Include="EntityFrameworkCore.Triggered" Version="0.2.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.6" />
   </ItemGroup>
diff --git a/samples/2 - PrimarySchool/2 - PrimarySchool.csproj b/samples/2 - PrimarySchool/2 - PrimarySchool.csproj
@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EntityFrameworkCore.Triggered" Version="0.2.0" />
+    <PackageReference Include="EntityFrameworkCore.Triggered" Version="0.2.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.6" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/2 - PrimarySchool/Program.cs b/samples/2 - PrimarySchool/Program.cs
@@ -11,17 +11,25 @@ class Program
     {
         static void Main(string[] args)
         {
+            IServiceScope serviceScope = null;
+
             var serviceProvider = new ServiceCollection()
-               .AddLogging()
                .AddDbContext<ApplicationContext>(options => {
                    options
-                      .UseInMemoryDatabase("ElementarySchool")
-                      .UseTriggers();
+                      .UseSqlite("Data source=test.db")
+                      .UseTriggers(triggerOptions => {
+                          triggerOptions.UseApplicationScopedServiceProviderAccessor(_ => serviceScope.ServiceProvider);
+                      });
                })
                .AddScoped<IBeforeSaveTrigger<Student>, Triggers.StudentSignupToMandatoryCourses>()
                .BuildServiceProvider();
 
-            var applicationContext = serviceProvider.GetRequiredService<ApplicationContext>();
+            serviceScope = serviceProvider.CreateScope();
+
+            var applicationContext = serviceScope.ServiceProvider.GetRequiredService<ApplicationContext>();
+
+            applicationContext.Database.EnsureDeleted();
+            applicationContext.Database.EnsureCreated();
 
             applicationContext.Courses.Add(new Course {
                 Id = 1,
diff --git a/samples/3 - StudentManagerAspNetCore/3 - StudentManagerAspNetCore.csproj b/samples/3 - StudentManagerAspNetCore/3 - StudentManagerAspNetCore.csproj
@@ -7,18 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="TestDatabase.db" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="EntityFrameworkCore.Triggered" Version="0.2.0" />
+    <PackageReference Include="EntityFrameworkCore.Triggered" Version="0.2.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.6">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.3" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/3 - StudentManagerAspNetCore/Startup.cs b/samples/3 - StudentManagerAspNetCore/Startup.cs
@@ -33,7 +33,7 @@ public void ConfigureServices(IServiceCollection services)
             services
                 .AddDbContext<ApplicationContext>(options => {
                     options
-                        .UseSqlite("Data source=TestDatabase.db")
+                        .UseSqlite("Data source=test.db")
                         .UseTriggers();
                 })
                 .AddScoped<IBeforeSaveTrigger<Course>, Triggers.CourseAutoSignupStudents>()
diff --git a/src/EntityFrameworkCore.Triggered/Internal/RecursiveTriggerContextDiscoveryStrategy.cs b/src/EntityFrameworkCore.Triggered/Internal/RecursiveTriggerContextDiscoveryStrategy.cs
@@ -47,7 +47,7 @@ public IEnumerable<ITriggerContextDescriptor> Discover(TriggerOptions options, T
                 // In case someone made a call to TriggerSession.DetectChanges, prior to calling RaiseBeforeSaveTriggers, we want to make sure that we include that discovery result in the first iteration
                 if (iteration == 0)
                 {
-                    changes = tracker.DiscoveredChanges!;
+                    changes = tracker.DiscoveredChanges.ToList();
                 }
 
                 if (changes.Any())

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public IEnumerable<ITriggerContextDescriptor> Discover(TriggerOptions options, T`
`47`	`47`	`// In case someone made a call to TriggerSession.DetectChanges, prior to calling RaiseBeforeSaveTriggers, we want to make sure that we include that discovery result in the first iteration`
`48`	`48`	`if (iteration == 0)`
`49`	`49`	`{`
`50`		`- changes = tracker.DiscoveredChanges!;`
	`50`	`+ changes = tracker.DiscoveredChanges.ToList();`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`if (changes.Any())`