Dtronix
diff --git a/‎src/Quarry.Benchmarks/Benchmarks/AggregateBenchmarks.cs‎
Lines changed: 3 additions & 3 deletions b/‎src/Quarry.Benchmarks/Benchmarks/AggregateBenchmarks.cs‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Quarry.Benchmarks/Benchmarks/ComplexQueryBenchmarks.cs‎
Lines changed: 2 additions & 2 deletions b/‎src/Quarry.Benchmarks/Benchmarks/ComplexQueryBenchmarks.cs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Quarry.Benchmarks/Benchmarks/FilterBenchmarks.cs‎
Lines changed: 3 additions & 3 deletions b/‎src/Quarry.Benchmarks/Benchmarks/FilterBenchmarks.cs‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Quarry.Benchmarks/Benchmarks/InsertBenchmarks.cs‎
Lines changed: 2 additions & 2 deletions b/‎src/Quarry.Benchmarks/Benchmarks/InsertBenchmarks.cs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Quarry.Benchmarks/Benchmarks/JoinBenchmarks.cs‎
Lines changed: 2 additions & 2 deletions b/‎src/Quarry.Benchmarks/Benchmarks/JoinBenchmarks.cs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Quarry.Benchmarks/Benchmarks/PaginationBenchmarks.cs‎
Lines changed: 2 additions & 2 deletions b/‎src/Quarry.Benchmarks/Benchmarks/PaginationBenchmarks.cs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Quarry.Benchmarks/Benchmarks/SelectBenchmarks.cs‎
Lines changed: 2 additions & 2 deletions b/‎src/Quarry.Benchmarks/Benchmarks/SelectBenchmarks.cs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Quarry.Benchmarks/Benchmarks/StringOpBenchmarks.cs‎
Lines changed: 2 additions & 2 deletions b/‎src/Quarry.Benchmarks/Benchmarks/StringOpBenchmarks.cs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Quarry.Benchmarks/Context/BenchDb.cs‎
Lines changed: 3 additions & 3 deletions b/‎src/Quarry.Benchmarks/Context/BenchDb.cs‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Quarry.Generator/DiagnosticDescriptors.cs‎
Lines changed: 15 additions & 0 deletions b/‎src/Quarry.Generator/DiagnosticDescriptors.cs‎
Lines changed: 15 additions & 0 deletions
@@ -33,7 +33,7 @@ public async Task<int> EfCore_Count()
     [Benchmark]
     public async Task<int> Quarry_Count()
     {
-        return await QuarryDb.Users
+        return await QuarryDb.Users()
             .Select(u => Sql.Count())
             .ExecuteScalarAsync<int>();
     }
@@ -64,7 +64,7 @@ public async Task<decimal> EfCore_Sum()
     [Benchmark]
     public async Task<decimal> Quarry_Sum()
     {
-        return await QuarryDb.Orders
+        return await QuarryDb.Orders()
             .Select(o => Sql.Sum(o.Total))
             .ExecuteScalarAsync<decimal>();
     }
@@ -95,7 +95,7 @@ public async Task<decimal> EfCore_Avg()
     [Benchmark]
     public async Task<decimal> Quarry_Avg()
     {
-        return await QuarryDb.Orders
+        return await QuarryDb.Orders()
             .Select(o => Sql.Avg(o.Total))
             .ExecuteScalarAsync<decimal>();
     }
 
@@ -61,7 +61,7 @@ public async Task<List<UserOrderDto>> EfCore_JoinFilterPaginate()
     [Benchmark]
     public async Task<List<UserOrderDto>> Quarry_JoinFilterPaginate()
     {
-        return await QuarryDb.Users
+        return await QuarryDb.Users()
             .Where(u => u.IsActive)
             .Join<Order>((u, o) => u.UserId == o.UserId.Id)
             .Select((u, o) => new UserOrderDto
@@ -116,7 +116,7 @@ public async Task<int> EfCore_MultiJoinAggregate()
     [Benchmark]
     public async Task<int> Quarry_MultiJoinAggregate()
     {
-        var results = await QuarryDb.Users
+        var results = await QuarryDb.Users()
             .Where(u => u.IsActive)
             .Join<Order>((u, o) => u.UserId == o.UserId.Id)
             .Join<OrderItem>((u, o, oi) => o.OrderId == oi.OrderId.Id)
 
@@ -50,7 +50,7 @@ public async Task<List<EfUser>> EfCore_WhereActive()
     [Benchmark]
     public async Task<List<EfUser>> Quarry_WhereActive()
     {
-        return await QuarryDb.Users
+        return await QuarryDb.Users()
             .Where(u => u.IsActive)
             .Select(u => new EfUser
             {
@@ -109,7 +109,7 @@ public async Task<List<UserSummaryDto>> EfCore_WhereCompound()
     [Benchmark]
     public async Task<List<UserSummaryDto>> Quarry_WhereCompound()
     {
-        return await QuarryDb.Users
+        return await QuarryDb.Users()
             .Where(u => u.IsActive)
             .Where(u => u.Email != null)
             .Select(u => new UserSummaryDto
@@ -163,7 +163,7 @@ public async Task<List<UserSummaryDto>> Quarry_WhereCompound()
     [Benchmark]
     public async Task<EfUser?> Quarry_WhereById()
     {
-        return await QuarryDb.Users
+        return await QuarryDb.Users()
             .Where(u => u.UserId == 42)
             .Select(u => new EfUser
             {
 
@@ -65,7 +65,7 @@ public async Task<int> EfCore_SingleInsert()
     [Benchmark]
     public async Task<int> Quarry_SingleInsert()
     {
-        return await QuarryDb.Insert(new User
+        return await QuarryDb.Users().Insert(new User
         {
             UserName = "BenchUser",
             Email = "bench@example.com",
@@ -134,6 +134,6 @@ public async Task<int> Quarry_BatchInsert10()
             IsActive = true,
             CreatedAt = DateTime.UtcNow
         });
-        return await QuarryDb.InsertMany(users).ExecuteNonQueryAsync();
+        return await QuarryDb.Users().InsertMany(users).ExecuteNonQueryAsync();
     }
 }
@@ -47,7 +47,7 @@ public async Task<List<UserOrderDto>> EfCore_InnerJoin()
     [Benchmark]
     public async Task<List<UserOrderDto>> Quarry_InnerJoin()
     {
-        return await QuarryDb.Users
+        return await QuarryDb.Users()
             .Join<Order>((u, o) => u.UserId == o.UserId.Id)
             .Select((u, o) => new UserOrderDto
             {
@@ -112,7 +112,7 @@ public async Task<List<UserOrderItemDto>> EfCore_ThreeTableJoin()
     [Benchmark]
     public async Task<List<UserOrderItemDto>> Quarry_ThreeTableJoin()
     {
-        return await QuarryDb.Users
+        return await QuarryDb.Users()
             .Join<Order>((u, o) => u.UserId == o.UserId.Id)
             .Join<OrderItem>((u, o, oi) => o.OrderId == oi.OrderId.Id)
             .Select((u, o, oi) => new UserOrderItemDto
 
@@ -51,7 +51,7 @@ public async Task<List<EfUser>> EfCore_LimitOffset()
     [Benchmark]
     public async Task<List<EfUser>> Quarry_LimitOffset()
     {
-        return await QuarryDb.Users
+        return await QuarryDb.Users()
             .Select(u => new EfUser
             {
                 UserId = u.UserId,
@@ -108,7 +108,7 @@ public async Task<List<EfUser>> EfCore_FirstPage()
     [Benchmark]
     public async Task<List<EfUser>> Quarry_FirstPage()
     {
-        return await QuarryDb.Users
+        return await QuarryDb.Users()
             .Select(u => new EfUser
             {
                 UserId = u.UserId,
 
@@ -48,7 +48,7 @@ public async Task<List<EfUser>> EfCore_SelectAll()
     [Benchmark]
     public async Task<List<EfUser>> Quarry_SelectAll()
     {
-        return await QuarryDb.Users
+        return await QuarryDb.Users()
             .Select(u => new EfUser
             {
                 UserId = u.UserId,
@@ -105,7 +105,7 @@ public async Task<List<UserSummaryDto>> EfCore_SelectProjection()
     [Benchmark]
     public async Task<List<UserSummaryDto>> Quarry_SelectProjection()
     {
-        return await QuarryDb.Users
+        return await QuarryDb.Users()
             .Select(u => new UserSummaryDto
             {
                 UserId = u.UserId,
 
@@ -53,7 +53,7 @@ public async Task<List<UserSummaryDto>> EfCore_Contains()
     [Benchmark]
     public async Task<List<UserSummaryDto>> Quarry_Contains()
     {
-        return await QuarryDb.Users
+        return await QuarryDb.Users()
             .Where(u => u.UserName.Contains("User05"))
             .Select(u => new UserSummaryDto
             {
@@ -109,7 +109,7 @@ public async Task<List<UserSummaryDto>> EfCore_StartsWith()
     [Benchmark]
     public async Task<List<UserSummaryDto>> Quarry_StartsWith()
     {
-        return await QuarryDb.Users
+        return await QuarryDb.Users()
             .Where(u => u.UserName.StartsWith("User0"))
             .Select(u => new UserSummaryDto
             {
 
@@ -5,7 +5,7 @@ namespace Quarry.Benchmarks.Context;
 [QuarryContext(Dialect = SqlDialect.SQLite)]
 public partial class BenchDb : QuarryContext
 {
-    public partial IQueryBuilder<User> Users { get; }
-    public partial IQueryBuilder<Order> Orders { get; }
-    public partial IQueryBuilder<OrderItem> OrderItems { get; }
+    public partial IEntityAccessor<User> Users();
+    public partial IEntityAccessor<Order> Orders();
+    public partial IEntityAccessor<OrderItem> OrderItems();
 }
@@ -444,6 +444,21 @@ internal static class DiagnosticDescriptors
                      "The existing runtime SqlBuilder path will be used. This is not an error — " +
                      "consider restructuring the query to enable optimization.");
 
+    /// <summary>
+    /// QRY033: Forked query chain — builder variable consumed by multiple execution paths.
+    /// Severity: Error
+    /// </summary>
+    public static readonly DiagnosticDescriptor ForkedQueryChain = new(
+        id: "QRY033",
+        title: "Forked query chain",
+        messageFormat: "Query builder variable '{0}' is consumed by multiple execution paths. Each execution path must use its own builder chain expression.",
+        category: Category,
+        defaultSeverity: DiagnosticSeverity.Error,
+        isEnabledByDefault: true,
+        description: "A query builder variable is used as the receiver for multiple execution-terminating calls " +
+                     "(e.g., ExecuteFetchAllAsync). Each execution path must use its own independent builder chain " +
+                     "to avoid confusing aliasing behavior from the immutable builder contract.");
+
     // ─── Migration diagnostics (QRY050–QRY055) ────────────────────────
 
     /// <summary>
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public async Task<int> EfCore_Count()`
`33`	`33`	`[Benchmark]`
`34`	`34`	`public async Task<int> Quarry_Count()`
`35`	`35`	`{`
`36`		`- return await QuarryDb.Users`
	`36`	`+ return await QuarryDb.Users()`
`37`	`37`	`.Select(u => Sql.Count())`
`38`	`38`	`.ExecuteScalarAsync<int>();`
`39`	`39`	`}`
`@@ -64,7 +64,7 @@ public async Task<decimal> EfCore_Sum()`
`64`	`64`	`[Benchmark]`
`65`	`65`	`public async Task<decimal> Quarry_Sum()`
`66`	`66`	`{`
`67`		`- return await QuarryDb.Orders`
	`67`	`+ return await QuarryDb.Orders()`
`68`	`68`	`.Select(o => Sql.Sum(o.Total))`
`69`	`69`	`.ExecuteScalarAsync<decimal>();`
`70`	`70`	`}`
`@@ -95,7 +95,7 @@ public async Task<decimal> EfCore_Avg()`
`95`	`95`	`[Benchmark]`
`96`	`96`	`public async Task<decimal> Quarry_Avg()`
`97`	`97`	`{`
`98`		`- return await QuarryDb.Orders`
	`98`	`+ return await QuarryDb.Orders()`
`99`	`99`	`.Select(o => Sql.Avg(o.Total))`
`100`	`100`	`.ExecuteScalarAsync<decimal>();`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public async Task<List<EfUser>> EfCore_WhereActive()`
`50`	`50`	`[Benchmark]`
`51`	`51`	`public async Task<List<EfUser>> Quarry_WhereActive()`
`52`	`52`	`{`
`53`		`- return await QuarryDb.Users`
	`53`	`+ return await QuarryDb.Users()`
`54`	`54`	`.Where(u => u.IsActive)`
`55`	`55`	`.Select(u => new EfUser`
`56`	`56`	`{`
`@@ -109,7 +109,7 @@ public async Task<List<UserSummaryDto>> EfCore_WhereCompound()`
`109`	`109`	`[Benchmark]`
`110`	`110`	`public async Task<List<UserSummaryDto>> Quarry_WhereCompound()`
`111`	`111`	`{`
`112`		`- return await QuarryDb.Users`
	`112`	`+ return await QuarryDb.Users()`
`113`	`113`	`.Where(u => u.IsActive)`
`114`	`114`	`.Where(u => u.Email != null)`
`115`	`115`	`.Select(u => new UserSummaryDto`
`@@ -163,7 +163,7 @@ public async Task<List<UserSummaryDto>> Quarry_WhereCompound()`
`163`	`163`	`[Benchmark]`
`164`	`164`	`public async Task<EfUser?> Quarry_WhereById()`
`165`	`165`	`{`
`166`		`- return await QuarryDb.Users`
	`166`	`+ return await QuarryDb.Users()`
`167`	`167`	`.Where(u => u.UserId == 42)`
`168`	`168`	`.Select(u => new EfUser`
`169`	`169`	`{`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public async Task<int> EfCore_SingleInsert()`
`65`	`65`	`[Benchmark]`
`66`	`66`	`public async Task<int> Quarry_SingleInsert()`
`67`	`67`	`{`
`68`		`- return await QuarryDb.Insert(new User`
	`68`	`+ return await QuarryDb.Users().Insert(new User`
`69`	`69`	`{`
`70`	`70`	`UserName = "BenchUser",`
`71`	`71`	`Email = "bench@example.com",`
`@@ -134,6 +134,6 @@ public async Task<int> Quarry_BatchInsert10()`
`134`	`134`	`IsActive = true,`
`135`	`135`	`CreatedAt = DateTime.UtcNow`
`136`	`136`	`});`
`137`		`- return await QuarryDb.InsertMany(users).ExecuteNonQueryAsync();`
	`137`	`+ return await QuarryDb.Users().InsertMany(users).ExecuteNonQueryAsync();`
`138`	`138`	`}`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public async Task<List<UserOrderDto>> EfCore_InnerJoin()`
`47`	`47`	`[Benchmark]`
`48`	`48`	`public async Task<List<UserOrderDto>> Quarry_InnerJoin()`
`49`	`49`	`{`
`50`		`- return await QuarryDb.Users`
	`50`	`+ return await QuarryDb.Users()`
`51`	`51`	`.Join<Order>((u, o) => u.UserId == o.UserId.Id)`
`52`	`52`	`.Select((u, o) => new UserOrderDto`
`53`	`53`	`{`
`@@ -112,7 +112,7 @@ public async Task<List<UserOrderItemDto>> EfCore_ThreeTableJoin()`
`112`	`112`	`[Benchmark]`
`113`	`113`	`public async Task<List<UserOrderItemDto>> Quarry_ThreeTableJoin()`
`114`	`114`	`{`
`115`		`- return await QuarryDb.Users`
	`115`	`+ return await QuarryDb.Users()`
`116`	`116`	`.Join<Order>((u, o) => u.UserId == o.UserId.Id)`
`117`	`117`	`.Join<OrderItem>((u, o, oi) => o.OrderId == oi.OrderId.Id)`
`118`	`118`	`.Select((u, o, oi) => new UserOrderItemDto`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public async Task<List<EfUser>> EfCore_LimitOffset()`
`51`	`51`	`[Benchmark]`
`52`	`52`	`public async Task<List<EfUser>> Quarry_LimitOffset()`
`53`	`53`	`{`
`54`		`- return await QuarryDb.Users`
	`54`	`+ return await QuarryDb.Users()`
`55`	`55`	`.Select(u => new EfUser`
`56`	`56`	`{`
`57`	`57`	`UserId = u.UserId,`
`@@ -108,7 +108,7 @@ public async Task<List<EfUser>> EfCore_FirstPage()`
`108`	`108`	`[Benchmark]`
`109`	`109`	`public async Task<List<EfUser>> Quarry_FirstPage()`
`110`	`110`	`{`
`111`		`- return await QuarryDb.Users`
	`111`	`+ return await QuarryDb.Users()`
`112`	`112`	`.Select(u => new EfUser`
`113`	`113`	`{`
`114`	`114`	`UserId = u.UserId,`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public async Task<List<EfUser>> EfCore_SelectAll()`
`48`	`48`	`[Benchmark]`
`49`	`49`	`public async Task<List<EfUser>> Quarry_SelectAll()`
`50`	`50`	`{`
`51`		`- return await QuarryDb.Users`
	`51`	`+ return await QuarryDb.Users()`
`52`	`52`	`.Select(u => new EfUser`
`53`	`53`	`{`
`54`	`54`	`UserId = u.UserId,`
`@@ -105,7 +105,7 @@ public async Task<List<UserSummaryDto>> EfCore_SelectProjection()`
`105`	`105`	`[Benchmark]`
`106`	`106`	`public async Task<List<UserSummaryDto>> Quarry_SelectProjection()`
`107`	`107`	`{`
`108`		`- return await QuarryDb.Users`
	`108`	`+ return await QuarryDb.Users()`
`109`	`109`	`.Select(u => new UserSummaryDto`
`110`	`110`	`{`
`111`	`111`	`UserId = u.UserId,`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public async Task<List<UserSummaryDto>> EfCore_Contains()`
`53`	`53`	`[Benchmark]`
`54`	`54`	`public async Task<List<UserSummaryDto>> Quarry_Contains()`
`55`	`55`	`{`
`56`		`- return await QuarryDb.Users`
	`56`	`+ return await QuarryDb.Users()`
`57`	`57`	`.Where(u => u.UserName.Contains("User05"))`
`58`	`58`	`.Select(u => new UserSummaryDto`
`59`	`59`	`{`
`@@ -109,7 +109,7 @@ public async Task<List<UserSummaryDto>> EfCore_StartsWith()`
`109`	`109`	`[Benchmark]`
`110`	`110`	`public async Task<List<UserSummaryDto>> Quarry_StartsWith()`
`111`	`111`	`{`
`112`		`- return await QuarryDb.Users`
	`112`	`+ return await QuarryDb.Users()`
`113`	`113`	`.Where(u => u.UserName.StartsWith("User0"))`
`114`	`114`	`.Select(u => new UserSummaryDto`
`115`	`115`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace Quarry.Benchmarks.Context;`
`5`	`5`	`[QuarryContext(Dialect = SqlDialect.SQLite)]`
`6`	`6`	`public partial class BenchDb : QuarryContext`
`7`	`7`	`{`
`8`		`- public partial IQueryBuilder<User> Users { get; }`
`9`		`- public partial IQueryBuilder<Order> Orders { get; }`
`10`		`- public partial IQueryBuilder<OrderItem> OrderItems { get; }`
	`8`	`+ public partial IEntityAccessor<User> Users();`
	`9`	`+ public partial IEntityAccessor<Order> Orders();`
	`10`	`+ public partial IEntityAccessor<OrderItem> OrderItems();`
`11`	`11`	`}`