Skip to content

Commit b355e72

Browse files
committed
Revert "Fix double-tagging in Prefetches, improved SessionTagPrefetchEntitySetTest"
This reverts commit efbb468.
1 parent efbb468 commit b355e72

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

Orm/Xtensive.Orm.Tests/Linq/TagTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,6 @@ public void SessionTagPrefetchEntitySetTest()
888888

889889
Assert.That(allCommands.Count, Is.EqualTo(2));
890890
Assert.IsTrue(allCommands[1].StartsWith("/*outermost*/"));
891-
Assert.AreEqual(Regex.Matches(allCommands[0], "outermost").Count, 1);
892891

893892
allCommands.Clear();
894893
}

Orm/Xtensive.Orm/Orm/Internals/Prefetch/EntitySetTask.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,11 @@ private QueryTask CreateQueryTask()
171171
var session = manager.Owner.Session;
172172
var scope = new CompiledQueryProcessingScope(null, null, parameterContext, false);
173173
QueryProvider = (CompilableProvider) session.StorageNode.InternalQueryCache.GetOrAdd(key, generator);
174+
if (session.Tags != null) {
175+
foreach (var tag in session.Tags) {
176+
QueryProvider = new TagProvider(QueryProvider, tag);
177+
}
178+
}
174179
ExecutableProvider executableProvider;
175180
using (scope.Enter()) {
176181
executableProvider = session.Compile(QueryProvider);

0 commit comments

Comments
 (0)