Create LeftJoinEx extension to not conflict with .NET10 LeftJoin

alex-kulakov · alex-kulakov · commit 31a5f2f8991d · 2026-02-27T12:42:47.000+05:00
diff --git a/ChangeLog/7.2.1-dev.txt b/ChangeLog/7.2.1-dev.txt
@@ -0,0 +1,2 @@
+[main] LeftJoin extension marked as Obsolete to prepare movement to .NET 10, LeftJoinEx provided as substitution
+[main] IPriorityQueue interface became Obsolete
diff --git a/Orm/Xtensive.Orm.Tests/Issues/IssueGithub0114_QueryRootReuseCauseNoRefJoin.cs b/Orm/Xtensive.Orm.Tests/Issues/IssueGithub0114_QueryRootReuseCauseNoRefJoin.cs
@@ -2389,7 +2389,7 @@ public void LeftJoinQueryReuse()
           .Select(promo => new {
             promo,
             notifications = session.Query.All<Notification>()
-              .LeftJoin(session.Query.All<User>(), n => n.TriggeredBy.Id, u => u.Id, (n, u) => new { n, u })
+              .LeftJoinEx(session.Query.All<User>(), n => n.TriggeredBy.Id, u => u.Id, (n, u) => new { n, u })
           })
           .Select(anon => new {
             contacted = anon.notifications.Select(c => c.n.Recipient.User.Id)
@@ -2401,9 +2401,9 @@ public void LeftJoinQueryReuse()
           .Select(promo => new { promo })
           .Select(anon => new {
             contacted = session.Query.All<Notification>()
-                .LeftJoin(session.Query.All<User>(), n => n.TriggeredBy.Id, u => u.Id, (n, u) => new { n, u }).Select(c => c.n.Recipient.User.Id)
+                .LeftJoinEx(session.Query.All<User>(), n => n.TriggeredBy.Id, u => u.Id, (n, u) => new { n, u }).Select(c => c.n.Recipient.User.Id)
               .Concat(session.Query.All<Notification>()
-                .LeftJoin(session.Query.All<User>(), n => n.TriggeredBy.Id, u => u.Id, (n, u) => new { n, u }).Select(c => c.n.Recipient.User.Id)),
+                .LeftJoinEx(session.Query.All<User>(), n => n.TriggeredBy.Id, u => u.Id, (n, u) => new { n, u }).Select(c => c.n.Recipient.User.Id)),
             promo = anon.promo
           }).ToArray();
 
diff --git a/Orm/Xtensive.Orm.Tests/Issues/IssueGithub0171_ReadDateTimeOffsetFromPackedTuple.cs b/Orm/Xtensive.Orm.Tests/Issues/IssueGithub0171_ReadDateTimeOffsetFromPackedTuple.cs
@@ -78,7 +78,7 @@ public void DateTimeOffsetCase()
         var loadWithCargo = new CargoLoad(session, cargo);
 
         var query = session.Query.All<CargoLoad>()
-          .LeftJoin(session.Query.All<Cargo>(),
+          .LeftJoinEx(session.Query.All<Cargo>(),
             cl => cl.Cargo,
             c => c,
             (cl, c) => new { CargoLoad = cl, Cargo = c })
@@ -102,7 +102,7 @@ public void DateTimeCase()
         var loadWithCargo = new CargoLoad(session, cargo);
 
         var query = session.Query.All<CargoLoad>()
-          .LeftJoin(session.Query.All<Cargo>(),
+          .LeftJoinEx(session.Query.All<Cargo>(),
             cl => cl.Cargo,
             c => c,
             (cl, c) => new { CargoLoad = cl, Cargo = c })
diff --git a/Orm/Xtensive.Orm.Tests/Issues/IssueJira0553_IncorrectLeftJoinOnNotNullEntityField.cs b/Orm/Xtensive.Orm.Tests/Issues/IssueJira0553_IncorrectLeftJoinOnNotNullEntityField.cs
@@ -136,7 +136,7 @@ public void BadWorkTest()
       using (var session = Domain.OpenSession())
       using (var t = session.OpenTransaction()) {
         var badResult = session.Query.All<Employee>()
-          .LeftJoin(
+          .LeftJoinEx(
             session.Query.All<EmployeeWithCar>(),
             e => e.Id,
             ewc => ewc.Id,
@@ -155,7 +155,7 @@ public void GoodWorkTest()
       using (var session = Domain.OpenSession())
       using (var transaction = session.OpenTransaction()) {
         var goodResult = session.Query.All<Employee>()
-          .LeftJoin(
+          .LeftJoinEx(
             session.Query.All<EmployeeWithCar>(),
             e => e.Id,
             ewc => ewc.Id,
@@ -173,15 +173,15 @@ public void WorkaroundTest()
       using (var session = Domain.OpenSession())
       using (var transaction = session.OpenTransaction()) {
         var wordaround = session.Query.All<Employee>()
-          .LeftJoin(
+          .LeftJoinEx(
             session.Query.All<EmployeeWithCar>(),
               e => e.Id,
               ewc => ewc.Id,
               (e, ewc) => new {
                 e.Id,
                 CarId = ewc.Car.Id
               })
-          .LeftJoin(
+          .LeftJoinEx(
             session.Query.All<Car>(),
             e => e.CarId,
             c => c.Id,
diff --git a/Orm/Xtensive.Orm.Tests/Issues/IssueJira0584_IncorrectMappingOfColumnInQuery.cs b/Orm/Xtensive.Orm.Tests/Issues/IssueJira0584_IncorrectMappingOfColumnInQuery.cs
@@ -526,8 +526,8 @@ public void IncludeProviderOptimizationTest01()
 
         var usefulColumns = masterCredit.Union(masterDebit);
         var readyForFilterQuery = from joinResult in usefulColumns
-          .LeftJoin(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
-          .LeftJoin(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
+          .LeftJoinEx(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
+          .LeftJoinEx(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
           let item = joinResult.pp
           select new CustomPosting() {
             Id = item.Id,
@@ -609,8 +609,8 @@ public void IncludeProviderOptimizationTest02()
 
         var usefulColumns = masterCredit.Union(masterDebit);
         var readyForFilterQuery = from joinResult in usefulColumns
-          .LeftJoin(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
-          .LeftJoin(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
+          .LeftJoinEx(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
+          .LeftJoinEx(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
           let item = joinResult.pp
           select new CustomPosting {
             Id = item.Id,
@@ -692,8 +692,8 @@ public void IncludeProviderOptimizationTest03()
 
         var usefulColumns = masterCredit.Union(masterDebit);
         var readyForFilterQuery = from joinResult in usefulColumns
-          .LeftJoin(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
-          .LeftJoin(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
+          .LeftJoinEx(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
+          .LeftJoinEx(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
           let item = joinResult.pp
           select new CustomPosting {
             Id = item.Id,
@@ -776,8 +776,8 @@ public void IncludeProviderOptimizationTest04()
 
         var usefulColumns = masterCredit.Union(masterDebit);
         var readyForFilterQuery = from joinResult in usefulColumns
-          .LeftJoin(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
-          .LeftJoin(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
+          .LeftJoinEx(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
+          .LeftJoinEx(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
           let item = joinResult.pp
           select new CustomPosting {
             Id = item.Id,
@@ -859,8 +859,8 @@ public void IncludeProviderOptimizationTest05()
 
         var usefulColumns = masterCredit.Union(masterDebit);
         var readyForFilterQuery = from joinResult in usefulColumns
-          .LeftJoin(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
-          .LeftJoin(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
+          .LeftJoinEx(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
+          .LeftJoinEx(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
           let item = joinResult.pp
           select new CustomPosting {
             Id = item.Id,
@@ -1029,7 +1029,7 @@ public void JoinAsSourceOfSetOperation()
         var result =
           from r in
             preResult.Join(tp.Distinct(), a => a.MasterAccount, a => a.Account, (a, pm) => new {pp = a, pm})
-              .LeftJoin(Query.All<TablePartBase.FinToolKind>(), a => a.pm.FinToolKind, a => a.Id, (a, b) => new {pp = a.pp, pm = a.pm, fk = b})
+              .LeftJoinEx(Query.All<TablePartBase.FinToolKind>(), a => a.pm.FinToolKind, a => a.Id, (a, b) => new {pp = a.pp, pm = a.pm, fk = b})
           let q = r.pp
           select
             new {
diff --git a/Orm/Xtensive.Orm.Tests/Issues/IssueJira0586_AnonymousTypeComparisonBug.cs b/Orm/Xtensive.Orm.Tests/Issues/IssueJira0586_AnonymousTypeComparisonBug.cs
@@ -108,7 +108,7 @@ public void MainTest()
 
         var masterCredit = Query.All<PacioliPosting>();
 
-        var join = from r in masterCredit.LeftJoin(
+        var join = from r in masterCredit.LeftJoinEx(
           tableParts,
           a => a.CreditAccount.Id,
           a => a.Account.Id,
diff --git a/Orm/Xtensive.Orm.Tests/Issues/IssueJira0617_IncorrectRemoveOfRedundantColumns.cs b/Orm/Xtensive.Orm.Tests/Issues/IssueJira0617_IncorrectRemoveOfRedundantColumns.cs
@@ -68,8 +68,8 @@ public void Test01()
 
         var usefulColumns = masterCredit.Union(masterDebit);
         var readyForFilterQuery = from joinResult in usefulColumns
-          .LeftJoin(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
-          .LeftJoin(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
+          .LeftJoinEx(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
+          .LeftJoinEx(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
           let item = joinResult.pp
           select new CustomPosting() {
             Id = item.Id,
@@ -149,8 +149,8 @@ public void Test02()
 
         var usefulColumns = masterCredit.Union(masterDebit);
         var readyForFilterQuery = from joinResult in usefulColumns
-          .LeftJoin(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
-          .LeftJoin(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
+          .LeftJoinEx(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
+          .LeftJoinEx(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
           let item = joinResult.pp
           select new CustomPosting {
             Id = item.Id,
@@ -230,8 +230,8 @@ public void Test03()
 
         var usefulColumns = masterCredit.Union(masterDebit);
         var readyForFilterQuery = from joinResult in usefulColumns
-          .LeftJoin(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
-          .LeftJoin(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
+          .LeftJoinEx(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
+          .LeftJoinEx(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
           let item = joinResult.pp
           select new CustomPosting {
             Id = item.Id,
@@ -312,8 +312,8 @@ public void Test04()
 
         var usefulColumns = masterCredit.Union(masterDebit);
         var readyForFilterQuery = from joinResult in usefulColumns
-          .LeftJoin(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
-          .LeftJoin(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
+          .LeftJoinEx(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
+          .LeftJoinEx(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
           let item = joinResult.pp
           select new CustomPosting {
             Id = item.Id,
@@ -393,8 +393,8 @@ public void Test05()
 
         var usefulColumns = masterCredit.Union(masterDebit);
         var readyForFilterQuery = from joinResult in usefulColumns
-          .LeftJoin(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
-          .LeftJoin(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
+          .LeftJoinEx(priceCalculation, a => a.SlaveAccount, a => a.Account, (pp, ps) => new {pp, ps})
+          .LeftJoinEx(priceCalculation, a => a.pp.MasterAccount, a => a.Account, (a, pm) => new {a.pp, a.ps, pm})
           let item = joinResult.pp
           select new CustomPosting {
             Id = item.Id,
@@ -562,7 +562,7 @@ public void Test08()
         var result =
           from r in
             preResult.Join(tp.Distinct(), a => a.MasterAccount, a => a.Account, (a, pm) => new {pp = a, pm})
-              .LeftJoin(Query.All<TablePartBase.FinToolKind>(), a => a.pm.FinToolKind, a => a.Id, (a, b) => new {pp = a.pp, pm = a.pm, fk = b})
+              .LeftJoinEx(Query.All<TablePartBase.FinToolKind>(), a => a.pm.FinToolKind, a => a.Id, (a, b) => new {pp = a.pp, pm = a.pm, fk = b})
           let q = r.pp
           select
             new {
diff --git a/Orm/Xtensive.Orm.Tests/Issues/IssueJira0803_ReuseOfJoiningExpressionCausesWrongTranslation.cs b/Orm/Xtensive.Orm.Tests/Issues/IssueJira0803_ReuseOfJoiningExpressionCausesWrongTranslation.cs
@@ -66,7 +66,7 @@ public void LeftJoinOneVariableUsage()
       using (var tx = session.OpenTransaction()) {
 
         var leftJoinWithExpression = session.Query.All<TestEntity>()
-          .LeftJoin(session.Query.All<TestEntity>().Where(it => it.Description == null),
+          .LeftJoinEx(session.Query.All<TestEntity>().Where(it => it.Description == null),
             o => o.Id,
             key,
             (o, i) => o)
@@ -78,7 +78,7 @@ public void LeftJoinOneVariableUsage()
         Assert.AreEqual(3, leftJoinWithExpression.Count);
 
         leftJoinWithExpression = session.Query.All<TestEntity>()
-          .LeftJoin(session.Query.All<TestEntity>().Where(it => it.Description == null),
+          .LeftJoinEx(session.Query.All<TestEntity>().Where(it => it.Description == null),
             key,
             i => i.Id,
             (o, i) => o)
@@ -101,7 +101,7 @@ public void LeftJoinTwoVariableUsage()
 
         var ex = Assert.Throws<QueryTranslationException>(() =>
           _ = session.Query.All<TestEntity>()
-          .LeftJoin(session.Query.All<TestEntity>().Where(it => it.Description == null),
+          .LeftJoinEx(session.Query.All<TestEntity>().Where(it => it.Description == null),
             key,
             key,
             (o, i) => o)
diff --git a/Orm/Xtensive.Orm.Tests/Linq/DynamicallyDefinedFields.cs b/Orm/Xtensive.Orm.Tests/Linq/DynamicallyDefinedFields.cs
@@ -1265,7 +1265,7 @@ public void LeftJoinTest()
       using (session.Activate())
       using (var transction = session.OpenTransaction()) {
         Assert.DoesNotThrow(() => {
-          session.Query.All<Area>().LeftJoin(session.Query.All<Group>(), area => (Group)area[testData.GroupFieldName],
+          session.Query.All<Area>().LeftJoinEx(session.Query.All<Group>(), area => (Group)area[testData.GroupFieldName],
             group => group, (area, @group) => new { Area = area, Group = group });
         });
       }
diff --git a/Orm/Xtensive.Orm.Tests/Linq/InTest.cs b/Orm/Xtensive.Orm.Tests/Linq/InTest.cs
@@ -76,7 +76,7 @@ public async Task StringContainsAsyncTest()
     public void MartinTest()
     {
       _ = Session.Query.All<Customer>()
-        .LeftJoin(Session.Query.All<Invoice>(), c => c, i => i.Customer, (c, i) => new { Customer = c, Invoice = i })
+        .LeftJoinEx(Session.Query.All<Invoice>(), c => c, i => i.Customer, (c, i) => new { Customer = c, Invoice = i })
         .GroupBy(i => new { i.Customer.FirstName, i.Customer.LastName })
         .Select(g => new { Key = g.Key, Count = g.Count(j => j.Invoice != null) })
         .ToList();
diff --git a/Orm/Xtensive.Orm.Tests/Linq/JoinTest.cs b/Orm/Xtensive.Orm.Tests/Linq/JoinTest.cs
@@ -143,7 +143,7 @@ public void SimpleLeftTest()
     {
       var traclCount = Session.Query.All<Track>().Count();
       var result = Session.Query.All<Track>()
-        .LeftJoin(Session.Query.All<Album>(),
+        .LeftJoinEx(Session.Query.All<Album>(),
           track => track.Album.AlbumId,
           album => album.AlbumId,
           (track, album) => new {track.Name, album.Title, album.AlbumId});
@@ -159,7 +159,7 @@ public void LeftJoin1Test()
       Session.Current.SaveChanges();
       var tracks = Session.Query.All<Track>();
       var albums = Session.Query.All<Album>();
-      var result = tracks.LeftJoin(
+      var result = tracks.LeftJoinEx(
         albums,
         track => track.Album,
         album => album,
@@ -179,7 +179,7 @@ public void LeftJoin2Test()
       Session.Current.SaveChanges();
       var tracks = Session.Query.All<Track>();
       var albums = Session.Query.All<Album>();
-      var result = tracks.LeftJoin(
+      var result = tracks.LeftJoinEx(
         albums,
         track => track.Album.AlbumId,
         album => album.AlbumId,
diff --git a/Orm/Xtensive.Orm.Tests/Linq/TagTest.cs b/Orm/Xtensive.Orm.Tests/Linq/TagTest.cs
@@ -256,7 +256,7 @@ public void TagInJoin()
         var inner = session.Query.All<BusinessUnit>().Tag("inner");
         var outer = session.Query.All<Property>().Tag("outer");
 
-        var query = outer.LeftJoin(inner, o => o.Owner.Id, i => i.Id, (i, o) => new { i, o });
+        var query = outer.LeftJoinEx(inner, o => o.Owner.Id, i => i.Id, (i, o) => new { i, o });
 
         var queryFormatter = session.Services.Demand<QueryFormatter>();
         var queryString = queryFormatter.ToSqlString(query);
@@ -514,7 +514,7 @@ public void TagInGrouping()
           .Tag("AfterSelect")
           .Where(g => g.Items.Count() >= 0)
           .Tag("AfterWhere")
-          .LeftJoin(session.Query.All<BusinessUnit>().Tag("WithinJoin"), g => g.Key, bu => bu.Id, (g, bu) => new { Key = bu, Items = g.Items });
+          .LeftJoinEx(session.Query.All<BusinessUnit>().Tag("WithinJoin"), g => g.Key, bu => bu.Id, (g, bu) => new { Key = bu, Items = g.Items });
 
         using (var tagScope = session.Tag("sessionTag6")) {
           session.Events.DbCommandExecuting += SqlCapturer;
diff --git a/Orm/Xtensive.Orm/Orm/QueryableExtensions.cs b/Orm/Xtensive.Orm/Orm/QueryableExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[main] LeftJoin extension marked as Obsolete to prepare movement to .NET 10, LeftJoinEx provided as substitution`
	`2`	`+[main] IPriorityQueue interface became Obsolete`
Original file line number	Diff line number	Diff line change
`@@ -1265,7 +1265,7 @@ public void LeftJoinTest()`
`1265`	`1265`	`using (session.Activate())`
`1266`	`1266`	`using (var transction = session.OpenTransaction()) {`
`1267`	`1267`	`Assert.DoesNotThrow(() => {`
`1268`		`- session.Query.All<Area>().LeftJoin(session.Query.All<Group>(), area => (Group)area[testData.GroupFieldName],`
	`1268`	`+ session.Query.All<Area>().LeftJoinEx(session.Query.All<Group>(), area => (Group)area[testData.GroupFieldName],`
`1269`	`1269`	`group => group, (area, @group) => new { Area = area, Group = group });`
`1270`	`1270`	`});`
`1271`	`1271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public async Task StringContainsAsyncTest()`
`76`	`76`	`public void MartinTest()`
`77`	`77`	`{`
`78`	`78`	`_ = Session.Query.All<Customer>()`
`79`		`- .LeftJoin(Session.Query.All<Invoice>(), c => c, i => i.Customer, (c, i) => new { Customer = c, Invoice = i })`
	`79`	`+ .LeftJoinEx(Session.Query.All<Invoice>(), c => c, i => i.Customer, (c, i) => new { Customer = c, Invoice = i })`
`80`	`80`	`.GroupBy(i => new { i.Customer.FirstName, i.Customer.LastName })`
`81`	`81`	`.Select(g => new { Key = g.Key, Count = g.Count(j => j.Invoice != null) })`
`82`	`82`	`.ToList();`