Merge branch 'releases/7.x.x'

Author: PawelGerr

src/Thinktecture.EntityFrameworkCore.Relational/Extensions/WindowFunction.cs

@@ -26,19 +26,19 @@ public abstract partial class WindowFunction
    /// <summary>
    /// Indication whether to use '*' when no arguments are provided.
    /// </summary>
-   public bool UseStarWhenNoArguments { get; }
+   public bool UseAsteriskWhenNoArguments { get; }
 
    /// <summary>
    /// Initializes a new instance of <see cref="WindowFunction"/>.
    /// </summary>
    /// <param name="name">The name of the window function.</param>
    /// <param name="returnType">Return type of the function.</param>
-   /// <param name="useStarWhenNoArguments">Indication whether to use '*' when no arguments are provided.</param>
-   protected WindowFunction(string name, Type returnType, bool useStarWhenNoArguments)
+   /// <param name="useAsteriskWhenNoArguments">Indication whether to use '*' when no arguments are provided.</param>
+   protected WindowFunction(string name, Type returnType, bool useAsteriskWhenNoArguments)
    {
       Name = EnsureValidName(name);
       ReturnType = returnType ?? throw new ArgumentNullException(nameof(returnType));
-      UseStarWhenNoArguments = useStarWhenNoArguments;
+      UseAsteriskWhenNoArguments = useAsteriskWhenNoArguments;
    }
 
    private static string EnsureValidName(string name)
@@ -59,12 +59,12 @@ private static string EnsureValidName(string name)
    /// </summary>
    /// <param name="name">The name of the function.</param>
    /// <param name="returnType">The return type of the function.</param>
-   /// <param name="useStarWhenNoArguments">Indication whether to use '*' when no arguments are provided.</param>
-   public void Deconstruct(out string name, out Type returnType, out bool useStarWhenNoArguments)
+   /// <param name="useAsteriskWhenNoArguments">Indication whether to use '*' when no arguments are provided.</param>
+   public void Deconstruct(out string name, out Type returnType, out bool useAsteriskWhenNoArguments)
    {
       name = Name;
       returnType = ReturnType;
-      useStarWhenNoArguments = UseStarWhenNoArguments;
+      useAsteriskWhenNoArguments = UseAsteriskWhenNoArguments;
    }
 }
 
@@ -77,11 +77,11 @@ public sealed class WindowFunction<TResult> : WindowFunction, IEquatable<WindowF
    /// Initializes a new instance of <see cref="WindowFunction{TResult}"/>.
    /// </summary>
    /// <param name="name">The name of the window function</param>
-   /// <param name="useStarWhenNoArguments">Indication whether to use '*' when no arguments are provided.</param>
+   /// <param name="useAsteriskWhenNoArguments">Indication whether to use '*' when no arguments are provided.</param>
    public WindowFunction(
       string name,
-      bool useStarWhenNoArguments = false)
-      : base(name, typeof(TResult), useStarWhenNoArguments)
+      bool useAsteriskWhenNoArguments = false)
+      : base(name, typeof(TResult), useAsteriskWhenNoArguments)
    {
    }
 

src/Thinktecture.EntityFrameworkCore.SqlServer/EntityFrameworkCore/Query/ExpressionTranslators/SqlServerDbFunctionsTranslator.cs

@@ -71,7 +71,7 @@ internal SqlServerDbFunctionsTranslator(
 
    private SqlExpression CreateWindowFunction(IReadOnlyList<SqlExpression> arguments)
    {
-      var (functionName, returnType, useStarWhenNoArguments) = (WindowFunction?)((SqlConstantExpression)arguments[1]).Value
+      var (functionName, returnType, useAsteriskWhenNoArguments) = (WindowFunction?)((SqlConstantExpression)arguments[1]).Value
                                                                ?? throw new ArgumentException("Window function must not be null");
 
       var orderByExpression = arguments[^1] as WindowFunctionOrderingsExpression;
@@ -101,7 +101,7 @@ private SqlExpression CreateWindowFunction(IReadOnlyList<SqlExpression> argument
       var partitionBy = partitionByExpression?.PartitionBy.Select(e => _sqlExpressionFactory.ApplyDefaultTypeMapping(e)).ToList();
 
       return new WindowFunctionExpression(functionName,
-                                          useStarWhenNoArguments,
+                                          useAsteriskWhenNoArguments,
                                           returnType,
                                           _typeMappingSource.FindMapping(returnType, _model),
                                           functionArgs,

src/Thinktecture.EntityFrameworkCore.SqlServer/EntityFrameworkCore/Query/SqlExpressions/WindowFunctionExpression.cs

@@ -15,15 +15,15 @@ public class WindowFunctionExpression : SqlExpression
    /// Creates a new instance of the <see cref="WindowFunctionExpression" /> class.
    /// </summary>
    /// <param name="name">Function name.</param>
-   /// <param name="useStarWhenNoArguments">Indication whether to use '*' when no arguments are provided.</param>
+   /// <param name="useAsteriskWhenNoArguments">Indication whether to use '*' when no arguments are provided.</param>
    /// <param name="type">Return type.</param>
    /// <param name="arguments">Arguments.</param>
    /// <param name="typeMapping">Type mapping.</param>
    /// <param name="partitions">A list expressions to partition by.</param>
    /// <param name="orderings">A list of ordering expressions to order by.</param>
    public WindowFunctionExpression(
       string name,
-      bool useStarWhenNoArguments,
+      bool useAsteriskWhenNoArguments,
       Type type,
       RelationalTypeMapping? typeMapping,
       IReadOnlyList<SqlExpression> arguments,
@@ -32,7 +32,7 @@ public WindowFunctionExpression(
       : base(type, typeMapping)
    {
       Name = name;
-      UseStarWhenNoArguments = useStarWhenNoArguments;
+      UseAsteriskWhenNoArguments = useAsteriskWhenNoArguments;
       Arguments = arguments;
       Partitions = partitions ?? Array.Empty<SqlExpression>();
       Orderings = orderings ?? Array.Empty<OrderingExpression>();
@@ -46,7 +46,7 @@ public WindowFunctionExpression(
    /// <summary>
    /// Indication whether to use '*' when no arguments are provided.
    /// </summary>
-   public bool UseStarWhenNoArguments { get; }
+   public bool UseAsteriskWhenNoArguments { get; }
 
    /// <summary>
    /// Function arguments.
@@ -71,7 +71,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
       var orderings = visitor.VisitExpressions(Orderings);
 
       return !ReferenceEquals(arguments, Arguments) || !ReferenceEquals(partitions, Partitions) || !ReferenceEquals(orderings, Orderings)
-                ? new WindowFunctionExpression(Name, UseStarWhenNoArguments, Type, TypeMapping, arguments, partitions, orderings)
+                ? new WindowFunctionExpression(Name, UseAsteriskWhenNoArguments, Type, TypeMapping, arguments, partitions, orderings)
                 : this;
    }
 
@@ -84,7 +84,7 @@ protected override void Print(ExpressionPrinter expressionPrinter)
       {
          expressionPrinter.VisitCollection(Arguments);
       }
-      else if (UseStarWhenNoArguments)
+      else if (UseAsteriskWhenNoArguments)
       {
          expressionPrinter.Append(" * ");
       }
@@ -118,7 +118,7 @@ private bool Equals(WindowFunctionExpression windowFunctionExpression)
    {
       return base.Equals(windowFunctionExpression)
              && Name.Equals(windowFunctionExpression.Name)
-             && UseStarWhenNoArguments.Equals(windowFunctionExpression.UseStarWhenNoArguments)
+             && UseAsteriskWhenNoArguments.Equals(windowFunctionExpression.UseAsteriskWhenNoArguments)
              && (Arguments == null ? windowFunctionExpression.Arguments == null : Arguments.SequenceEqual(windowFunctionExpression.Arguments))
              && (Partitions == null ? windowFunctionExpression.Partitions == null : Partitions.SequenceEqual(windowFunctionExpression.Partitions))
              && (Orderings == null ? windowFunctionExpression.Orderings == null : Orderings.SequenceEqual(windowFunctionExpression.Orderings));
@@ -130,7 +130,7 @@ public override int GetHashCode()
       var hash = new HashCode();
       hash.Add(base.GetHashCode());
       hash.Add(Name);
-      hash.Add(UseStarWhenNoArguments);
+      hash.Add(UseAsteriskWhenNoArguments);
 
       foreach (var argument in Arguments)
       {

src/Thinktecture.EntityFrameworkCore.SqlServer/EntityFrameworkCore/Query/ThinktectureSqlServerQuerySqlGenerator.cs

@@ -52,7 +52,7 @@ private Expression VisitWindowFunction(WindowFunctionExpression windowFunctionEx
          Visit(argument);
       }
 
-      if (windowFunctionExpression.Arguments.Count == 0 && windowFunctionExpression.UseStarWhenNoArguments)
+      if (windowFunctionExpression.Arguments.Count == 0 && windowFunctionExpression.UseAsteriskWhenNoArguments)
          Sql.Append("*");
 
       Sql.Append(") OVER (");