Change the property types of ISpecification<T>.AsNoTracking and ISpecification<T>.AsNoTrackingWithIdentityResolution back to bool, add a property ISpecification<T>.TrackingFlag, so this is not a breaking change. Change AsNoTrackingEvaluator, AsNoTrackingWithIdentityResolutionEvaluator and AsTrackingEvaluator to check the ISpecification<T>.TrackingFlag value. If AsTracking, AsNoTracking, and AsNoTrackingWithIdentityResolution are called at the same time, only the last call will be active, If none of AsTracking, AsNoTracking, and AsNoTrackingWithIdentityResolution is called, the consumer's default tracking behavior will be used(default tracking behavior could be configured by using DbContextOptionsBuilder.UseQueryTrackingBehavior method).

coolbyte · coolbyte · commit d30a4b9aeff5 · 2023-07-01T23:14:04.000+08:00
diff --git a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/AsNoTrackingEvaluator.cs b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/AsNoTrackingEvaluator.cs
@@ -15,7 +15,7 @@ private AsNoTrackingEvaluator() { }
 
     public IQueryable<T> GetQuery<T>(IQueryable<T> query, ISpecification<T> specification) where T : class
     {
-      if (specification.AsNoTracking == true)
+      if (specification is { TrackingFlag: true, AsNoTracking: true })
       {
         query = query.AsNoTracking();
       }
diff --git a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/AsNoTrackingWithIdentityResolutionEvaluator.cs b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/AsNoTrackingWithIdentityResolutionEvaluator.cs
@@ -16,7 +16,7 @@ private AsNoTrackingWithIdentityResolutionEvaluator() { }
 
     public IQueryable<T> GetQuery<T>(IQueryable<T> query, ISpecification<T> specification) where T : class
     {
-      if (specification.AsNoTrackingWithIdentityResolution == true)
+      if (specification is { TrackingFlag: true, AsNoTrackingWithIdentityResolution: true })
       {
         query = query.AsNoTrackingWithIdentityResolution();
       }
diff --git a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/AsTrackingEvaluator.cs b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/AsTrackingEvaluator.cs
@@ -16,7 +16,7 @@ private AsTrackingEvaluator() { }
 
     /// <inheritdoc />
     public IQueryable<T> GetQuery<T>(IQueryable<T> query, ISpecification<T> specification) where T : class =>
-      specification is { AsNoTracking: false, AsNoTrackingWithIdentityResolution: false }
+      specification is { TrackingFlag: true, AsNoTracking: false, AsNoTrackingWithIdentityResolution: false }
         ? query.AsTracking()
         : query;
   }
diff --git a/Specification/src/Ardalis.Specification/Builder/SpecificationBuilderExtensions.cs b/Specification/src/Ardalis.Specification/Builder/SpecificationBuilderExtensions.cs
@@ -392,6 +392,7 @@ public static ISpecificationBuilder<T> AsNoTracking<T>(
       if (condition)
       {
         specificationBuilder.Specification.AsNoTracking = true;
+        specificationBuilder.Specification.TrackingFlag = true;
       }
 
       return specificationBuilder;
@@ -428,6 +429,7 @@ public static ISpecificationBuilder<T> AsTracking<T>(
       {
         specificationBuilder.Specification.AsNoTracking = false;
         specificationBuilder.Specification.AsNoTrackingWithIdentityResolution = false;
+        specificationBuilder.Specification.TrackingFlag = true;
       }
 
       return specificationBuilder;
@@ -500,6 +502,7 @@ public static ISpecificationBuilder<T> AsNoTrackingWithIdentityResolution<T>(
       if (condition)
       {
         specificationBuilder.Specification.AsNoTrackingWithIdentityResolution = true;
+        specificationBuilder.Specification.TrackingFlag = true;
       }
 
       return specificationBuilder;
diff --git a/Specification/src/Ardalis.Specification/ISpecification.cs b/Specification/src/Ardalis.Specification/ISpecification.cs
@@ -102,7 +102,7 @@ public interface ISpecification<T>
     /// that are returned. When true, if the entity instances are modified, this will not be detected
     /// by the change tracker.
     /// </summary>
-    bool? AsNoTracking { get; }
+    bool AsNoTracking { get; }
 
     /// <summary>
     /// Returns whether or not the generated sql query should be split into multiple SQL queries
@@ -121,7 +121,7 @@ public interface ISpecification<T>
     /// <remarks>
     /// for more info: https://docs.microsoft.com/en-us/ef/core/change-tracking/identity-resolution#identity-resolution-and-queries
     /// </remarks>
-    bool? AsNoTrackingWithIdentityResolution { get; }
+    bool AsNoTrackingWithIdentityResolution { get; }
 
     /// <summary>
     /// Returns whether or not the query should ignore the defined global query filters 
@@ -130,6 +130,11 @@ public interface ISpecification<T>
     /// for more info: https://docs.microsoft.com/en-us/ef/core/querying/filters
     /// </remarks>
     bool IgnoreQueryFilters { get; }
+    
+    /// <summary>
+    /// Returns true when tracking behavior is changed
+    /// </summary>
+    bool TrackingFlag { get; }
 
     /// <summary>
     /// Applies the query defined within the specification to the given objects.
diff --git a/Specification/src/Ardalis.Specification/Specification.cs b/Specification/src/Ardalis.Specification/Specification.cs
@@ -109,15 +109,18 @@ public virtual bool IsSatisfiedBy(T entity)
     public bool CacheEnabled { get; internal set; }
 
     /// <inheritdoc/>
-    public bool? AsNoTracking { get; internal set; }
+    public bool AsNoTracking { get; internal set; }
 
     /// <inheritdoc/>
     public bool AsSplitQuery { get; internal set; } = false;
 
     /// <inheritdoc/>
-    public bool? AsNoTrackingWithIdentityResolution { get; internal set; }
+    public bool AsNoTrackingWithIdentityResolution { get; internal set; }
 
     /// <inheritdoc/>
     public bool IgnoreQueryFilters { get; internal set; } = false;
+    
+    /// <inheritdoc/>
+    public bool TrackingFlag { get;  internal set;}
   }
 }
diff --git a/Specification/tests/Ardalis.Specification.UnitTests/BuilderTests/SpecificationBuilderExtensions_AsNoTracking.cs b/Specification/tests/Ardalis.Specification.UnitTests/BuilderTests/SpecificationBuilderExtensions_AsNoTracking.cs
@@ -11,15 +11,17 @@ public void DoesNothing_GivenSpecWithoutAsNoTracking()
     {
       var spec = new StoreEmptySpec();
 
-      spec.AsNoTracking.Should().Be(null);
+      spec.AsNoTracking.Should().Be(false);
+      spec.TrackingFlag.Should().Be(false);
     }
 
     [Fact]
     public void DoesNothing_GivenAsNoTrackingWithFalseCondition()
     {
       var spec = new CompanyByIdWithFalseConditions(1);
 
-      spec.AsNoTracking.Should().Be(null);
+      spec.AsNoTracking.Should().Be(false);
+      spec.TrackingFlag.Should().Be(false);
     }
 
     [Fact]
@@ -28,6 +30,7 @@ public void FlagsAsNoTracking_GivenSpecWithAsNoTracking()
       var spec = new CompanyByIdAsUntrackedSpec(1);
 
       spec.AsNoTracking.Should().Be(true);
+      spec.TrackingFlag.Should().Be(true);
     }
 
     [Fact]
@@ -36,6 +39,7 @@ void FlagsAsNoTracking_GivenSpecWithAsTrackingAndEndWithAsNoTracking()
       var spec = new CompanyByIdWithAsTrackingAsUntrackedSpec(1);
 
       spec.AsNoTracking.Should().Be(true);
+      spec.TrackingFlag.Should().Be(true);
     }
   }
 }
diff --git a/Specification/tests/Ardalis.Specification.UnitTests/BuilderTests/SpecificationBuilderExtensions_AsNoTrackingWithIdentityResolution.cs b/Specification/tests/Ardalis.Specification.UnitTests/BuilderTests/SpecificationBuilderExtensions_AsNoTrackingWithIdentityResolution.cs
@@ -11,15 +11,17 @@ public void DoesNothing_GivenSpecWithoutAsNoTrackingWithIdentityResolution()
     {
       var spec = new StoreEmptySpec();
 
-      spec.AsNoTrackingWithIdentityResolution.Should().Be(null);
+      spec.AsNoTrackingWithIdentityResolution.Should().Be(false);
+      spec.TrackingFlag.Should().Be(false);
     }
 
     [Fact]
     public void DoesNothing_GivenAsNoTrackingWithIdentityResolutionWithFalseCondition()
     {
       var spec = new CompanyByIdWithFalseConditions(1);
 
-      spec.AsNoTrackingWithIdentityResolution.Should().Be(null);
+      spec.AsNoTrackingWithIdentityResolution.Should().Be(false);
+      spec.TrackingFlag.Should().Be(false);
     }
 
     [Fact]
@@ -28,6 +30,7 @@ public void FlagsAsNoTracking_GivenSpecWithAsNoTrackingWithIdentityResolution()
       var spec = new CompanyByIdAsUntrackedWithIdentityResolutionSpec(1);
 
       spec.AsNoTrackingWithIdentityResolution.Should().Be(true);
+      spec.TrackingFlag.Should().Be(true);
     }
 
     [Fact]
@@ -36,6 +39,7 @@ void FlagsAsNoTracking_GivenSpecWithAsTrackingAndEndWithAsNoTrackingWithIdentity
       var spec = new CompanyByIdWithAsTrackingAsUntrackedWithIdentityResolutionSpec(1);
 
       spec.AsNoTrackingWithIdentityResolution.Should().Be(true);
+      spec.TrackingFlag.Should().Be(true);
     }
   }
 }
diff --git a/Specification/tests/Ardalis.Specification.UnitTests/BuilderTests/SpecificationBuilderExtensions_AsTracking.cs b/Specification/tests/Ardalis.Specification.UnitTests/BuilderTests/SpecificationBuilderExtensions_AsTracking.cs
@@ -11,17 +11,19 @@ public void DoesNothing_GivenSpecWithoutAsTracking()
     {
       var spec = new StoreEmptySpec();
 
-      spec.AsNoTracking.Should().BeNull();
-      spec.AsNoTrackingWithIdentityResolution.Should().BeNull();
+      spec.AsNoTracking.Should().Be(false);
+      spec.AsNoTrackingWithIdentityResolution.Should().Be(false);
+      spec.TrackingFlag.Should().Be(false);
     }
 
     [Fact]
     public void DoesNothing_GivenAsTrackingWithFalseCondition()
     {
       var spec = new CompanyByIdWithFalseConditions(1);
 
-      spec.AsNoTracking.Should().BeNull();
-      spec.AsNoTrackingWithIdentityResolution.Should().BeNull();
+      spec.AsNoTracking.Should().Be(false);
+      spec.AsNoTrackingWithIdentityResolution.Should().Be(false);
+      spec.TrackingFlag.Should().Be(false);
     }
 
     [Fact]
@@ -31,6 +33,7 @@ public void FlagsAsTracking_GivenSpecWithAsTracking()
 
       spec.AsNoTracking.Should().Be(false);
       spec.AsNoTrackingWithIdentityResolution.Should().Be(false);
+      spec.TrackingFlag.Should().Be(true);
     }
 
     [Fact]
@@ -40,6 +43,7 @@ public void FlagsAsTracking_GivenSpecWithAsNoTrackingAndEndWithAsTracking()
 
       spec.AsNoTracking.Should().Be(false);
       spec.AsNoTrackingWithIdentityResolution.Should().Be(false);
+      spec.TrackingFlag.Should().Be(true);
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ private AsNoTrackingEvaluator() { }`
`15`	`15`
`16`	`16`	`public IQueryable<T> GetQuery<T>(IQueryable<T> query, ISpecification<T> specification) where T : class`
`17`	`17`	`{`
`18`		`- if (specification.AsNoTracking == true)`
	`18`	`+ if (specification is { TrackingFlag: true, AsNoTracking: true })`
`19`	`19`	`{`
`20`	`20`	`query = query.AsNoTracking();`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ private AsNoTrackingWithIdentityResolutionEvaluator() { }`
`16`	`16`
`17`	`17`	`public IQueryable<T> GetQuery<T>(IQueryable<T> query, ISpecification<T> specification) where T : class`
`18`	`18`	`{`
`19`		`- if (specification.AsNoTrackingWithIdentityResolution == true)`
	`19`	`+ if (specification is { TrackingFlag: true, AsNoTrackingWithIdentityResolution: true })`
`20`	`20`	`{`
`21`	`21`	`query = query.AsNoTrackingWithIdentityResolution();`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ private AsTrackingEvaluator() { }`
`16`	`16`
`17`	`17`	`/// <inheritdoc />`
`18`	`18`	`public IQueryable<T> GetQuery<T>(IQueryable<T> query, ISpecification<T> specification) where T : class =>`
`19`		`- specification is { AsNoTracking: false, AsNoTrackingWithIdentityResolution: false }`
	`19`	`+ specification is { TrackingFlag: true, AsNoTracking: false, AsNoTrackingWithIdentityResolution: false }`
`20`	`20`	`? query.AsTracking()`
`21`	`21`	`: query;`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -392,6 +392,7 @@ public static ISpecificationBuilder<T> AsNoTracking<T>(`
`392`	`392`	`if (condition)`
`393`	`393`	`{`
`394`	`394`	`specificationBuilder.Specification.AsNoTracking = true;`
	`395`	`+ specificationBuilder.Specification.TrackingFlag = true;`
`395`	`396`	`}`
`396`	`397`
`397`	`398`	`return specificationBuilder;`
`@@ -428,6 +429,7 @@ public static ISpecificationBuilder<T> AsTracking<T>(`
`428`	`429`	`{`
`429`	`430`	`specificationBuilder.Specification.AsNoTracking = false;`
`430`	`431`	`specificationBuilder.Specification.AsNoTrackingWithIdentityResolution = false;`
	`432`	`+ specificationBuilder.Specification.TrackingFlag = true;`
`431`	`433`	`}`
`432`	`434`
`433`	`435`	`return specificationBuilder;`
`@@ -500,6 +502,7 @@ public static ISpecificationBuilder<T> AsNoTrackingWithIdentityResolution<T>(`
`500`	`502`	`if (condition)`
`501`	`503`	`{`
`502`	`504`	`specificationBuilder.Specification.AsNoTrackingWithIdentityResolution = true;`
	`505`	`+ specificationBuilder.Specification.TrackingFlag = true;`
`503`	`506`	`}`
`504`	`507`
`505`	`508`	`return specificationBuilder;`
Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,17 @@ public void DoesNothing_GivenSpecWithoutAsNoTracking()`
`11`	`11`	`{`
`12`	`12`	`var spec = new StoreEmptySpec();`
`13`	`13`
`14`		`- spec.AsNoTracking.Should().Be(null);`
	`14`	`+ spec.AsNoTracking.Should().Be(false);`
	`15`	`+ spec.TrackingFlag.Should().Be(false);`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`[Fact]`
`18`	`19`	`public void DoesNothing_GivenAsNoTrackingWithFalseCondition()`
`19`	`20`	`{`
`20`	`21`	`var spec = new CompanyByIdWithFalseConditions(1);`
`21`	`22`
`22`		`- spec.AsNoTracking.Should().Be(null);`
	`23`	`+ spec.AsNoTracking.Should().Be(false);`
	`24`	`+ spec.TrackingFlag.Should().Be(false);`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`[Fact]`
`@@ -28,6 +30,7 @@ public void FlagsAsNoTracking_GivenSpecWithAsNoTracking()`
`28`	`30`	`var spec = new CompanyByIdAsUntrackedSpec(1);`
`29`	`31`
`30`	`32`	`spec.AsNoTracking.Should().Be(true);`
	`33`	`+ spec.TrackingFlag.Should().Be(true);`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`[Fact]`
`@@ -36,6 +39,7 @@ void FlagsAsNoTracking_GivenSpecWithAsTrackingAndEndWithAsNoTracking()`
`36`	`39`	`var spec = new CompanyByIdWithAsTrackingAsUntrackedSpec(1);`
`37`	`40`
`38`	`41`	`spec.AsNoTracking.Should().Be(true);`
	`42`	`+ spec.TrackingFlag.Should().Be(true);`
`39`	`43`	`}`
`40`	`44`	`}`
`41`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,17 +11,19 @@ public void DoesNothing_GivenSpecWithoutAsTracking()`
`11`	`11`	`{`
`12`	`12`	`var spec = new StoreEmptySpec();`
`13`	`13`
`14`		`- spec.AsNoTracking.Should().BeNull();`
`15`		`- spec.AsNoTrackingWithIdentityResolution.Should().BeNull();`
	`14`	`+ spec.AsNoTracking.Should().Be(false);`
	`15`	`+ spec.AsNoTrackingWithIdentityResolution.Should().Be(false);`
	`16`	`+ spec.TrackingFlag.Should().Be(false);`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`[Fact]`
`19`	`20`	`public void DoesNothing_GivenAsTrackingWithFalseCondition()`
`20`	`21`	`{`
`21`	`22`	`var spec = new CompanyByIdWithFalseConditions(1);`
`22`	`23`
`23`		`- spec.AsNoTracking.Should().BeNull();`
`24`		`- spec.AsNoTrackingWithIdentityResolution.Should().BeNull();`
	`24`	`+ spec.AsNoTracking.Should().Be(false);`
	`25`	`+ spec.AsNoTrackingWithIdentityResolution.Should().Be(false);`
	`26`	`+ spec.TrackingFlag.Should().Be(false);`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`[Fact]`
`@@ -31,6 +33,7 @@ public void FlagsAsTracking_GivenSpecWithAsTracking()`
`31`	`33`
`32`	`34`	`spec.AsNoTracking.Should().Be(false);`
`33`	`35`	`spec.AsNoTrackingWithIdentityResolution.Should().Be(false);`
	`36`	`+ spec.TrackingFlag.Should().Be(true);`
`34`	`37`	`}`
`35`	`38`
`36`	`39`	`[Fact]`
`@@ -40,6 +43,7 @@ public void FlagsAsTracking_GivenSpecWithAsNoTrackingAndEndWithAsTracking()`
`40`	`43`
`41`	`44`	`spec.AsNoTracking.Should().Be(false);`
`42`	`45`	`spec.AsNoTrackingWithIdentityResolution.Should().Be(false);`
	`46`	`+ spec.TrackingFlag.Should().Be(true);`
`43`	`47`	`}`
`44`	`48`	`}`
`45`	`49`	`}`