Skip to content

Commit efbb468

Browse files
committed
Fix double-tagging in Prefetches, improved SessionTagPrefetchEntitySetTest
1 parent 260cfc4 commit efbb468

2 files changed

Lines changed: 1 addition & 5 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -888,6 +888,7 @@ 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);
891892

892893
allCommands.Clear();
893894
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,6 @@ 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-
}
179174
ExecutableProvider executableProvider;
180175
using (scope.Enter()) {
181176
executableProvider = session.Compile(QueryProvider);

0 commit comments

Comments
 (0)