Merge pull request #83 from koenbeuk/interception-tweaks

Interception tweaks

Author: koenbeuk

src/EntityFrameworkCore.Triggered/Internal/TriggerSessionSaveChangesInterceptor.cs

@@ -76,14 +76,16 @@ public InterceptionResult<int> SavingChanges(DbContextEventData eventData, Inter
             if (!(eventData.Context is TriggeredDbContext))
             {
                 EnlistTriggerSession(eventData);
+                Debug.Assert(_triggerSession != null);
 
                 var defaultAutoDetectChangesEnabled = eventData.Context.ChangeTracker.AutoDetectChangesEnabled;
 
                 try
                 {
+
                     eventData.Context.ChangeTracker.AutoDetectChangesEnabled = false;
 
-                    _triggerSession!.RaiseBeforeSaveTriggers().GetAwaiter().GetResult();
+                    _triggerSession.RaiseBeforeSaveTriggers().GetAwaiter().GetResult();
                     _triggerSession.CaptureDiscoveredChanges();
                 }
                 finally
@@ -101,13 +103,17 @@ public async ValueTask<InterceptionResult<int>> SavingChangesAsync(DbContextEven
         {
             if (!(eventData.Context is TriggeredDbContext))
             {
-            EnlistTriggerSession(eventData);
+                EnlistTriggerSession(eventData);
+                Debug.Assert(_triggerSession != null);
 
                 var defaultAutoDetectChangesEnabled = eventData.Context.ChangeTracker.AutoDetectChangesEnabled;
 
                 try
                 {
-                    await _triggerSession!.RaiseBeforeSaveTriggers(cancellationToken).ConfigureAwait(false);
+
+                    eventData.Context.ChangeTracker.AutoDetectChangesEnabled = false;
+
+                    await _triggerSession.RaiseBeforeSaveTriggers(cancellationToken).ConfigureAwait(false);
                     _triggerSession.CaptureDiscoveredChanges();
                 }
                 finally
@@ -137,9 +143,9 @@ public async ValueTask<int> SavedChangesAsync(SaveChangesCompletedEventData even
         {
             if (!(eventData.Context is TriggeredDbContext))
             {
-                EnlistTriggerSession(eventData);
+                Debug.Assert(_triggerSession != null);
 
-                await _triggerSession!.RaiseAfterSaveTriggers(cancellationToken).ConfigureAwait(false);
+                await _triggerSession.RaiseAfterSaveTriggers(cancellationToken).ConfigureAwait(false);
 
                 DelistTriggerSession(eventData);
             }
@@ -151,9 +157,9 @@ public void SaveChangesFailed(DbContextErrorEventData eventData)
         {
             if (!(eventData.Context is TriggeredDbContext))
             {
-                EnlistTriggerSession(eventData);
+                Debug.Assert(_triggerSession != null);
 
-                _triggerSession!.RaiseAfterSaveFailedTriggers(eventData.Exception).GetAwaiter().GetResult();
+                _triggerSession.RaiseAfterSaveFailedTriggers(eventData.Exception).GetAwaiter().GetResult();
 
                 DelistTriggerSession(eventData);
             }
@@ -163,9 +169,9 @@ public async Task SaveChangesFailedAsync(DbContextErrorEventData eventData, Canc
         {
             if (!(eventData.Context is TriggeredDbContext))
             {
-                EnlistTriggerSession(eventData);
+                Debug.Assert(_triggerSession != null);
 
-                await _triggerSession!.RaiseAfterSaveFailedTriggers(eventData.Exception, cancellationToken).ConfigureAwait(false);
+                await _triggerSession.RaiseAfterSaveFailedTriggers(eventData.Exception, cancellationToken).ConfigureAwait(false);
 
                 DelistTriggerSession(eventData);
             }