Use CompilableProviderExtensions.Calculate() extension everywhere

Author: alex-kulakov

Orm/Xtensive.Orm/Orm/Rse/CompilableProviderExtensions.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2008-2020 Xtensive LLC.
+// Copyright (C) 2008-2025 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Alexey Kochetov
@@ -23,16 +23,26 @@ namespace Xtensive.Orm.Rse
   /// </summary>
   public static class CompilableProviderExtensions
   {
-    public static CompilableProvider Calculate(this CompilableProvider source,
+    public static CalculateProvider Calculate(this CompilableProvider source,
       params CalculatedColumnDescriptor[] columns)
     {
-      return new CalculateProvider(source, (IReadOnlyList<CalculatedColumnDescriptor>) columns);
+      return new CalculateProvider(source, columns, false);
     }
 
-    public static CompilableProvider Calculate(this CompilableProvider source, bool isInlined,
+    public static CalculateProvider Calculate(this CompilableProvider source, bool isInlined,
       params CalculatedColumnDescriptor[] columns)
     {
-      return new CalculateProvider(source, (IReadOnlyList<CalculatedColumnDescriptor>) columns, isInlined);
+      return new CalculateProvider(source, columns, isInlined);
+    }
+
+    public static CalculateProvider Calculate(this CompilableProvider source, IReadOnlyList<CalculatedColumnDescriptor> columns)
+    {
+      return new CalculateProvider(source, columns);
+    }
+
+    public static CalculateProvider Calculate(this CompilableProvider source, bool isInlined, IReadOnlyList<CalculatedColumnDescriptor> columns)
+    {
+      return new CalculateProvider(source, columns, isInlined);
     }
 
     public static CompilableProvider RowNumber(this CompilableProvider source, string columnName)

Orm/Xtensive.Orm/Orm/Rse/Providers/CompilableProviderVisitor.cs

@@ -168,7 +168,7 @@ protected override Provider VisitCalculate(CalculateProvider provider)
       }
       if (!translated && source == provider.Source)
         return provider;
-      return new CalculateProvider(source, descriptors);
+      return source.Calculate(descriptors);
     }
 
     protected override Provider VisitRowNumber(RowNumberProvider provider)

Orm/Xtensive.Orm/Orm/Rse/Transformation/ColumnMappingInspector.cs

@@ -317,7 +317,7 @@ protected override Provider VisitCalculate(CalculateProvider provider)
 
       return !translated && newSourceProvider == provider.Source && descriptors.Count == provider.CalculatedColumns.Length
         ? provider
-        : new CalculateProvider(newSourceProvider, descriptors);
+        : newSourceProvider.Calculate(descriptors);
     }
 
     protected override Provider VisitRowNumber(RowNumberProvider provider)

Orm/Xtensive.Orm/Orm/Rse/Transformation/Internals/ApplyProviderCorrectorRewriter.cs

@@ -396,7 +396,7 @@ private static CalculateProvider RecreateCalculate(CalculateProvider provider, C
       var ccds = provider.CalculatedColumns
         .SelectToArray(
           column => new CalculatedColumnDescriptor(column.Name, column.Type, column.Expression));
-      return new CalculateProvider(source, (IReadOnlyList<CalculatedColumnDescriptor>) ccds);
+      return source.Calculate(ccds);
     }
 
     private CalculateProvider RewriteCalculateColumnExpressions(
@@ -412,7 +412,7 @@ private CalculateProvider RewriteCalculateColumnExpressions(
           var currentName = columnCollection.Single(c => c.Index==column.Index).Name;
           return new CalculatedColumnDescriptor(currentName, column.Type, newColumnExpression);
         });
-      return new CalculateProvider(source, (IReadOnlyList<CalculatedColumnDescriptor>) ccd);
+      return source.Calculate(ccd);
     }
 
     #endregion