diff --git a/ChangeLog/7.1.0-RC2-dev.txt b/ChangeLog/7.1.0-RC2-dev.txt index 8c8dadf00b..0a8eaa49ba 100644 --- a/ChangeLog/7.1.0-RC2-dev.txt +++ b/ChangeLog/7.1.0-RC2-dev.txt @@ -1,2 +1,3 @@ [main] Added support for DefaultExpression within Linq queries [main] Support for TimeOnly ctors (time parts and ticks) in Linq, except for SQLite and MySQL providers +[main] No Session.Activate() in ToTransactional extension, it affects EntitySet enumeration. diff --git a/Orm/Xtensive.Orm.Tests/Storage/Prefetch/PrefetchManagerAdvancedTest.cs b/Orm/Xtensive.Orm.Tests/Storage/Prefetch/PrefetchManagerAdvancedTest.cs index 20b7015752..13ae8c9979 100644 --- a/Orm/Xtensive.Orm.Tests/Storage/Prefetch/PrefetchManagerAdvancedTest.cs +++ b/Orm/Xtensive.Orm.Tests/Storage/Prefetch/PrefetchManagerAdvancedTest.cs @@ -502,7 +502,7 @@ public void EntitySetInNestedSessionWhenItsOwnerHasAlreadyBeenFetchedInAnotherSe using (Session.Deactivate()) { // Prevents Session switching check error Assert.AreSame(null, Session.Current); foreach (var orderDetail in order.Details) { - Assert.AreSame(order.Details.Session, Session.Current); + Assert.AreSame(order.Details.Session, session); Assert.AreSame(session, orderDetail.Session); Assert.AreSame(session, orderDetail.Order.Session); Assert.AreSame(order, orderDetail.Order); diff --git a/Orm/Xtensive.Orm/Orm/TransactionalExtensions.cs b/Orm/Xtensive.Orm/Orm/TransactionalExtensions.cs index af8601e4c1..2fc87f6efa 100644 --- a/Orm/Xtensive.Orm/Orm/TransactionalExtensions.cs +++ b/Orm/Xtensive.Orm/Orm/TransactionalExtensions.cs @@ -177,7 +177,6 @@ public static IEnumerable ToTransactional(this IEnumerable source, Sess /// "Transactional" version of sequence. public static IEnumerable ToTransactional(this IEnumerable source, Session session, IsolationLevel isolationLevel) { - using (session.Activate(true)) using (var tx = session.OpenAutoTransaction(isolationLevel)) { foreach (var item in source) yield return item;