Skip to content

Commit 83646ed

Browse files
authored
Merge pull request #317 from DataObjects-NET/master-no-activation-on-es-enumeration
No activation on EntitySet enumeration
2 parents 566de7c + d9a920a commit 83646ed

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

ChangeLog/7.1.0-RC2-dev.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[main] Added support for DefaultExpression within Linq queries
22
[main] Support for TimeOnly ctors (time parts and ticks) in Linq, except for SQLite and MySQL providers
3+
[main] No Session.Activate() in ToTransactional extension, it affects EntitySet<T> enumeration.

Orm/Xtensive.Orm.Tests/Storage/Prefetch/PrefetchManagerAdvancedTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ public void EntitySetInNestedSessionWhenItsOwnerHasAlreadyBeenFetchedInAnotherSe
502502
using (Session.Deactivate()) { // Prevents Session switching check error
503503
Assert.AreSame(null, Session.Current);
504504
foreach (var orderDetail in order.Details) {
505-
Assert.AreSame(order.Details.Session, Session.Current);
505+
Assert.AreSame(order.Details.Session, session);
506506
Assert.AreSame(session, orderDetail.Session);
507507
Assert.AreSame(session, orderDetail.Order.Session);
508508
Assert.AreSame(order, orderDetail.Order);

Orm/Xtensive.Orm/Orm/TransactionalExtensions.cs

-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ public static IEnumerable<T> ToTransactional<T>(this IEnumerable<T> source, Sess
177177
/// <returns>"Transactional" version of sequence.</returns>
178178
public static IEnumerable<T> ToTransactional<T>(this IEnumerable<T> source, Session session, IsolationLevel isolationLevel)
179179
{
180-
using (session.Activate(true))
181180
using (var tx = session.OpenAutoTransaction(isolationLevel)) {
182181
foreach (var item in source)
183182
yield return item;

0 commit comments

Comments
 (0)