Fixed .Union tagging; SessionTagInUnion test

Author: SergeiPavlov

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

@@ -7,6 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using Xtensive.Core;
@@ -48,7 +49,7 @@ public class TagType : Entity
     [Field(Length = 55, Nullable = false)]
     public string Name { get; set; }
 
-    [Field] 
+    [Field]
     public bool Active { get; set; }
   }
 
@@ -386,7 +387,8 @@ public void TagInGrouping()
 
         session.Events.DbCommandExecuting += SqlCapturer;
         foreach (var group in query)
-          foreach (var groupItem in group.Items);
+          foreach (var groupItem in group.Items)
+            ;
         session.Events.DbCommandExecuting -= SqlCapturer;
 
         PrintList(allCommands);
@@ -403,7 +405,8 @@ public void TagInGrouping()
 
         session.Events.DbCommandExecuting += SqlCapturer;
         foreach (var group in query)
-          foreach (var groupItem in group.Items);
+          foreach (var groupItem in group.Items)
+            ;
         session.Events.DbCommandExecuting -= SqlCapturer;
 
         PrintList(allCommands);
@@ -420,7 +423,8 @@ public void TagInGrouping()
 
         session.Events.DbCommandExecuting += SqlCapturer;
         foreach (var group in query)
-          foreach (var groupItem in group.Items);
+          foreach (var groupItem in group.Items)
+            ;
         session.Events.DbCommandExecuting -= SqlCapturer;
 
         PrintList(allCommands);
@@ -438,7 +442,8 @@ public void TagInGrouping()
 
         session.Events.DbCommandExecuting += SqlCapturer;
         foreach (var group in query)
-          foreach (var groupItem in group.Items);
+          foreach (var groupItem in group.Items)
+            ;
         session.Events.DbCommandExecuting -= SqlCapturer;
 
         PrintList(allCommands);
@@ -456,7 +461,8 @@ public void TagInGrouping()
 
         session.Events.DbCommandExecuting += SqlCapturer;
         foreach (var group in query)
-          foreach (var groupItem in group.Items);
+          foreach (var groupItem in group.Items)
+            ;
         session.Events.DbCommandExecuting -= SqlCapturer;
 
         PrintList(allCommands);
@@ -477,7 +483,8 @@ public void TagInGrouping()
 
         session.Events.DbCommandExecuting += SqlCapturer;
         foreach (var group in query1)
-          foreach (var groupItem in group.Items);
+          foreach (var groupItem in group.Items)
+            ;
         session.Events.DbCommandExecuting -= SqlCapturer;
 
         PrintList(allCommands);
@@ -925,6 +932,29 @@ void SqlCapturer(object sender, DbCommandEventArgs args)
       }
     }
 
+    [Test]
+    public void SessionTagInUnion()
+    {
+      var allCommands = new List<string>();
+
+      var session = Session.Demand();
+      using var outermost = session.Tag("outermost");
+
+      using (var innerTx = session.OpenTransaction(TransactionOpenMode.New)) {
+        session.Events.DbCommandExecuting += SqlCapturer;
+        var left = session.Query.All<BusinessUnit>();
+        var right = session.Query.All<BusinessUnit>();
+        var result = left.Union(right).ToArray();
+        session.Events.DbCommandExecuting -= SqlCapturer;
+
+        Assert.That(allCommands.Count, Is.EqualTo(1));
+        Assert.AreEqual(Regex.Matches(allCommands[0], "outermost").Count, 1);
+      }
+
+      void SqlCapturer(object sender, DbCommandEventArgs args) =>
+        allCommands.Add(args.Command.CommandText);
+    }
+
     private static bool CheckTag(string query, string expectedComment, TagsLocation place)
     {
       return place switch {

Orm/Xtensive.Orm/Orm/Providers/CompilationService.cs

@@ -20,10 +20,8 @@ public sealed class CompilationService
     private readonly Func<CompilerConfiguration, IPreCompiler> preCompilerProvider;
     private readonly Func<CompilerConfiguration, ICompiler, IPostCompiler> postCompilerProvider;
 
-    public CompilerConfiguration CreateConfiguration(Session session)
-    {
-      return new CompilerConfiguration {StorageNode = session.StorageNode};
-    }
+    public CompilerConfiguration CreateConfiguration(Session session) =>
+      new CompilerConfiguration { StorageNode = session.StorageNode, Tags = session.Tags };
 
     public ExecutableProvider Compile(CompilableProvider provider, CompilerConfiguration configuration)
     {

Orm/Xtensive.Orm/Orm/Providers/CompilerConfiguration.cs

@@ -4,11 +4,14 @@
 // Created by: Denis Krjuchkov
 // Created:    2012.02.26
 
+using System.Collections.Generic;
+
 namespace Xtensive.Orm.Providers
 {
   public sealed class CompilerConfiguration
   {
     public bool PrepareRequest { get; set; }
+    public IReadOnlyList<string> Tags { get; init; }
 
     internal StorageNode StorageNode { get; set; }
 

Orm/Xtensive.Orm/Orm/Providers/DomainHandler.cs

@@ -98,7 +98,9 @@ protected virtual IPreCompiler CreatePreCompiler(CompilerConfiguration configura
         applyCorrector,
         skipTakeCorrector,
         new RedundantColumnOptimizer(),
-        new OrderingCorrector(ResolveOrderingDescriptor));
+        new OrderingCorrector(ResolveOrderingDescriptor)) {
+          Tags = configuration.Tags
+      };
     }
 
     /// <summary>

Orm/Xtensive.Orm/Orm/QueryEndpoint.cs

@@ -63,13 +63,7 @@ public sealed class QueryEndpoint
     public IQueryable<T> All<T>()
       where T : class, IEntity
     {
-      var result = Provider.CreateQuery<T>(BuildRootExpression(typeof(T)));
-      if (session.Tags != null) {
-        foreach (var tag in session.Tags) {
-          result = result.Tag(tag);
-        }
-      }
-      return result;
+      return Provider.CreateQuery<T>(BuildRootExpression(typeof(T)));
     }
 
     /// <summary>
@@ -84,13 +78,7 @@ public IQueryable<T> All<T>()
     /// </returns>
     public IQueryable All(Type elementType)
     {
-      var result = ((IQueryProvider) Provider).CreateQuery(BuildRootExpression(elementType));
-      if (session.Tags != null) {
-        foreach (var tag in session.Tags) {
-          result = result.Tag(tag);
-        }
-      }
-      return result;
+      return ((IQueryProvider) Provider).CreateQuery(BuildRootExpression(elementType));
     }
 
     #region Full-text related

Orm/Xtensive.Orm/Orm/Rse/Compilation/CompositePreCompiler.cs

@@ -13,10 +13,17 @@ namespace Xtensive.Orm.Rse.Compilation
   public sealed class CompositePreCompiler : IPreCompiler
   {
     public List<IPreCompiler> Items { get; private set; }
+    public IReadOnlyList<string> Tags { get; init; }
 
     public CompilableProvider Process(CompilableProvider rootProvider)
     {
       var provider = rootProvider;
+      if (Tags != null) {
+        foreach (var tag in Tags) {
+          provider = new TagProvider(provider, tag);
+        }
+      }
+
       foreach (var item in Items)
         provider = item.Process(provider);
       return provider;
@@ -30,4 +37,4 @@ public CompositePreCompiler(params IPreCompiler[] preCompilers)
       Items = preCompilers.ToList();
     }
   }
-}
+}