Various code style/cleanup (#3261)

npgsql · Sep 2, 2024 · 1206e51 · 1206e51
1 parent 69fac7b
commit 1206e51
Show file tree

Hide file tree

Showing 95 changed files with 796 additions and 695 deletions.
diff --git a/src/EFCore.PG.NTS/Infrastructure/Internal/NetTopologySuiteDataSourceConfigurationPlugin.cs b/src/EFCore.PG.NTS/Infrastructure/Internal/NetTopologySuiteDataSourceConfigurationPlugin.cs
@@ -1,5 +1,3 @@
-using Npgsql.EntityFrameworkCore.PostgreSQL.Internal;
-
 namespace Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal;
 
 /// <summary>

diff --git a/...pressionTranslators/Internal/NpgsqlNetTopologySuiteAggregateMethodCallTranslatorPlugin.cs b/...pressionTranslators/Internal/NpgsqlNetTopologySuiteAggregateMethodCallTranslatorPlugin.cs
@@ -28,10 +28,10 @@ public NpgsqlNetTopologySuiteAggregateMethodCallTranslatorPlugin(
             throw new ArgumentException($"Must be an {nameof(NpgsqlSqlExpressionFactory)}", nameof(sqlExpressionFactory));
         }
 
-        Translators = new IAggregateMethodCallTranslator[]
-        {
+        Translators =
+        [
             new NpgsqlNetTopologySuiteAggregateMethodTranslator(npgsqlSqlExpressionFactory, typeMappingSource)
-        };
+        ];
     }
 
     /// <summary>
@@ -103,19 +103,18 @@ public NpgsqlNetTopologySuiteAggregateMethodTranslator(
             // https://postgis.net/docs/ST_ConvexHull.html
             return _sqlExpressionFactory.Function(
                 "ST_ConvexHull",
-                new[]
-                {
+                [
                     _sqlExpressionFactory.AggregateFunction(
                         "ST_Collect",
-                        new[] { sqlExpression },
+                        [sqlExpression],
                         source,
                         nullable: true,
-                        argumentsPropagateNullability: new[] { false },
+                        argumentsPropagateNullability: [false],
                         typeof(Geometry),
                         GetMapping())
-                },
+                ],
                 nullable: true,
-                argumentsPropagateNullability: new[] { true },
+                argumentsPropagateNullability: [true],
                 typeof(Geometry),
                 GetMapping());
         }
@@ -127,10 +126,10 @@ public NpgsqlNetTopologySuiteAggregateMethodTranslator(
             return _sqlExpressionFactory.Convert(
                 _sqlExpressionFactory.AggregateFunction(
                     "ST_Extent",
-                    new[] { sqlExpression },
+                    [sqlExpression],
                     source,
                     nullable: true,
-                    argumentsPropagateNullability: new[] { false },
+                    argumentsPropagateNullability: [false],
                     typeof(Geometry),
                     GetMapping()),
                 typeof(Geometry), GetMapping());
@@ -140,10 +139,10 @@ public NpgsqlNetTopologySuiteAggregateMethodTranslator(
         {
             return _sqlExpressionFactory.AggregateFunction(
                 method == UnionMethod ? "ST_Union" : "ST_Collect",
-                new[] { sqlExpression },
+                [sqlExpression],
                 source,
                 nullable: true,
-                argumentsPropagateNullability: new[] { false },
+                argumentsPropagateNullability: [false],
                 typeof(Geometry),
                 GetMapping());
         }

diff --git a/....NTS/Query/ExpressionTranslators/Internal/NpgsqlNetTopologySuiteMemberTranslatorPlugin.cs b/....NTS/Query/ExpressionTranslators/Internal/NpgsqlNetTopologySuiteMemberTranslatorPlugin.cs
@@ -20,7 +20,7 @@ public NpgsqlNetTopologySuiteMemberTranslatorPlugin(
         IRelationalTypeMappingSource typeMappingSource,
         ISqlExpressionFactory sqlExpressionFactory)
     {
-        Translators = new IMemberTranslator[] { new NpgsqlGeometryMemberTranslator(sqlExpressionFactory, typeMappingSource), };
+        Translators = [new NpgsqlGeometryMemberTranslator(sqlExpressionFactory, typeMappingSource)];
     }
 
     /// <summary>

diff --git a/.../Query/ExpressionTranslators/Internal/NpgsqlNetTopologySuiteMethodCallTranslatorPlugin.cs b/.../Query/ExpressionTranslators/Internal/NpgsqlNetTopologySuiteMethodCallTranslatorPlugin.cs
@@ -27,7 +27,7 @@ public NpgsqlNetTopologySuiteMethodCallTranslatorPlugin(
             throw new ArgumentException($"Must be an {nameof(NpgsqlSqlExpressionFactory)}", nameof(sqlExpressionFactory));
         }
 
-        Translators = new IMethodCallTranslator[] { new NpgsqlGeometryMethodTranslator(npgsqlSqlExpressionFactory, typeMappingSource), };
+        Translators = [new NpgsqlGeometryMethodTranslator(npgsqlSqlExpressionFactory, typeMappingSource)];
     }
 
     /// <summary>
@@ -90,15 +90,15 @@ public NpgsqlGeometryMethodTranslator(
         {
             nameof(NpgsqlNetTopologySuiteDbFunctionsExtensions.Transform) => _sqlExpressionFactory.Function(
                 "ST_Transform",
-                new[] { arguments[1], arguments[2] },
+                [arguments[1], arguments[2]],
                 nullable: true,
                 argumentsPropagateNullability: TrueArrays[2],
                 method.ReturnType,
                 arguments[1].TypeMapping),
 
             nameof(NpgsqlNetTopologySuiteDbFunctionsExtensions.Force2D) => _sqlExpressionFactory.Function(
                 "ST_Force2D",
-                new[] { arguments[1] },
+                [arguments[1]],
                 nullable: true,
                 TrueArrays[1],
                 method.ReturnType,
@@ -110,9 +110,9 @@ public NpgsqlGeometryMethodTranslator(
                 arguments[2]),
 
             nameof(NpgsqlNetTopologySuiteDbFunctionsExtensions.Distance) =>
-                TranslateGeometryMethod(arguments[1], method, new[] { arguments[2], arguments[3] }),
+                TranslateGeometryMethod(arguments[1], method, [arguments[2], arguments[3]]),
             nameof(NpgsqlNetTopologySuiteDbFunctionsExtensions.IsWithinDistance) =>
-                TranslateGeometryMethod(arguments[1], method, new[] { arguments[2], arguments[3], arguments[4] }),
+                TranslateGeometryMethod(arguments[1], method, [arguments[2], arguments[3], arguments[4]]),
 
             _ => null
         };
@@ -147,7 +147,7 @@ public NpgsqlGeometryMethodTranslator(
         {
             return _sqlExpressionFactory.Function(
                 "ST_GeometryN",
-                new[] { instance, OneBased(arguments[0]) },
+                [instance, OneBased(arguments[0])],
                 nullable: true,
                 argumentsPropagateNullability: TrueArrays[2],
                 method.ReturnType,

diff --git a/src/EFCore.PG.NodaTime/Query/Internal/NpgsqlNodaTimeAggregateMethodCallTranslatorPlugin.cs b/src/EFCore.PG.NodaTime/Query/Internal/NpgsqlNodaTimeAggregateMethodCallTranslatorPlugin.cs
@@ -25,10 +25,10 @@ public NpgsqlNodaTimeAggregateMethodCallTranslatorPlugin(
             throw new ArgumentException($"Must be an {nameof(NpgsqlSqlExpressionFactory)}", nameof(sqlExpressionFactory));
         }
 
-        Translators = new IAggregateMethodCallTranslator[]
-        {
+        Translators =
+        [
             new NpgsqlNodaTimeAggregateMethodTranslator(npgsqlSqlExpressionFactory, typeMappingSource)
-        };
+        ];
     }
 
     /// <summary>
@@ -87,19 +87,19 @@ public NpgsqlNodaTimeAggregateMethodTranslator(
         return method.Name switch
         {
             nameof(NpgsqlNodaTimeDbFunctionsExtensions.Sum) => _sqlExpressionFactory.AggregateFunction(
-                "sum", new[] { sqlExpression }, source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
+                "sum", [sqlExpression], source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
                 returnType: sqlExpression.Type, sqlExpression.TypeMapping),
 
             nameof(NpgsqlNodaTimeDbFunctionsExtensions.Average) => _sqlExpressionFactory.AggregateFunction(
-                "avg", new[] { sqlExpression }, source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
+                "avg", [sqlExpression], source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
                 returnType: sqlExpression.Type, sqlExpression.TypeMapping),
 
             nameof(NpgsqlNodaTimeDbFunctionsExtensions.RangeAgg) => _sqlExpressionFactory.AggregateFunction(
-                "range_agg", new[] { sqlExpression }, source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
+                "range_agg", [sqlExpression], source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
                 returnType: method.ReturnType, _typeMappingSource.FindMapping(method.ReturnType)),
 
             nameof(NpgsqlNodaTimeDbFunctionsExtensions.RangeIntersectAgg) => _sqlExpressionFactory.AggregateFunction(
-                "range_intersect_agg", new[] { sqlExpression }, source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
+                "range_intersect_agg", [sqlExpression], source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
                 returnType: sqlExpression.Type, sqlExpression.TypeMapping),
 
             _ => null

diff --git a/src/EFCore.PG.NodaTime/Query/Internal/NpgsqlNodaTimeMemberTranslatorPlugin.cs b/src/EFCore.PG.NodaTime/Query/Internal/NpgsqlNodaTimeMemberTranslatorPlugin.cs
@@ -21,10 +21,10 @@ public NpgsqlNodaTimeMemberTranslatorPlugin(
         IRelationalTypeMappingSource typeMappingSource,
         ISqlExpressionFactory sqlExpressionFactory)
     {
-        Translators = new IMemberTranslator[]
-        {
-            new NpgsqlNodaTimeMemberTranslator(typeMappingSource, (NpgsqlSqlExpressionFactory)sqlExpressionFactory),
-        };
+        Translators =
+        [
+            new NpgsqlNodaTimeMemberTranslator(typeMappingSource, (NpgsqlSqlExpressionFactory)sqlExpressionFactory)
+        ];
     }
 
     /// <summary>
@@ -196,7 +196,7 @@ SqlExpression TranslateDurationTotalMember(SqlExpression instance, double diviso
             return _sqlExpressionFactory.Not(
                 _sqlExpressionFactory.Function(
                     "lower_inf",
-                    new[] { instance },
+                    [instance],
                     nullable: true,
                     argumentsPropagateNullability: TrueArrays[1],
                     typeof(bool)));
@@ -207,7 +207,7 @@ SqlExpression TranslateDurationTotalMember(SqlExpression instance, double diviso
             return _sqlExpressionFactory.Not(
                 _sqlExpressionFactory.Function(
                     "upper_inf",
-                    new[] { instance },
+                    [instance],
                     nullable: true,
                     argumentsPropagateNullability: TrueArrays[1],
                     typeof(bool)));
@@ -223,7 +223,7 @@ SqlExpression TranslateDurationTotalMember(SqlExpression instance, double diviso
         SqlExpression Lower()
             => _sqlExpressionFactory.Function(
                 "lower",
-                new[] { instance },
+                [instance],
                 nullable: true,
                 argumentsPropagateNullability: TrueArrays[1],
                 typeof(Interval),
@@ -232,7 +232,7 @@ SqlExpression Lower()
         SqlExpression Upper()
             => _sqlExpressionFactory.Function(
                 "upper",
-                new[] { instance },
+                [instance],
                 nullable: true,
                 argumentsPropagateNullability: TrueArrays[1],
                 typeof(Interval),
@@ -270,7 +270,7 @@ SqlExpression Upper()
         SqlExpression Lower()
             => _sqlExpressionFactory.Function(
                 "lower",
-                new[] { instance },
+                [instance],
                 nullable: true,
                 argumentsPropagateNullability: TrueArrays[1],
                 typeof(LocalDate),
@@ -279,7 +279,7 @@ SqlExpression Lower()
         SqlExpression Upper()
             => _sqlExpressionFactory.Function(
                 "upper",
-                new[] { instance },
+                [instance],
                 nullable: true,
                 argumentsPropagateNullability: TrueArrays[1],
                 typeof(LocalDate),
@@ -304,7 +304,7 @@ SqlExpression Upper()
             "DayOfWeek" when GetDatePartExpression(instance, "dow", true) is var getValueExpression
                 => _sqlExpressionFactory.Case(
                     getValueExpression,
-                    new[] { new CaseWhenClause(_sqlExpressionFactory.Constant(0), _sqlExpressionFactory.Constant(7)) },
+                    [new CaseWhenClause(_sqlExpressionFactory.Constant(0), _sqlExpressionFactory.Constant(7))],
                     getValueExpression),
 
             // PG allows converting a timestamp directly to date, truncating the time; but given a timestamptz, it performs a time zone
@@ -350,7 +350,7 @@ private SqlExpression GetDatePartExpressionDouble(
     {
         var result = _sqlExpressionFactory.Function(
             "date_part",
-            new[] { _sqlExpressionFactory.Constant(partName), instance },
+            [_sqlExpressionFactory.Constant(partName), instance],
             nullable: true,
             argumentsPropagateNullability: TrueArrays[2],
             typeof(double));
@@ -359,7 +359,7 @@ private SqlExpression GetDatePartExpressionDouble(
         {
             result = _sqlExpressionFactory.Function(
                 "floor",
-                new[] { result },
+                [result],
                 nullable: true,
                 argumentsPropagateNullability: TrueArrays[1],
                 typeof(double));

diff --git a/src/EFCore.PG.NodaTime/Query/Internal/NpgsqlNodaTimeMethodCallTranslatorPlugin.cs b/src/EFCore.PG.NodaTime/Query/Internal/NpgsqlNodaTimeMethodCallTranslatorPlugin.cs
@@ -23,10 +23,10 @@ public NpgsqlNodaTimeMethodCallTranslatorPlugin(
         IRelationalTypeMappingSource typeMappingSource,
         ISqlExpressionFactory sqlExpressionFactory)
     {
-        Translators = new IMethodCallTranslator[]
-        {
-            new NpgsqlNodaTimeMethodCallTranslator(typeMappingSource, (NpgsqlSqlExpressionFactory)sqlExpressionFactory),
-        };
+        Translators =
+        [
+            new NpgsqlNodaTimeMethodCallTranslator(typeMappingSource, (NpgsqlSqlExpressionFactory)sqlExpressionFactory)
+        ];
     }
 
     /// <summary>
@@ -336,8 +336,8 @@ public NpgsqlNodaTimeMethodCallTranslator(
         static PgFunctionExpression IntervalPart(string datePart, SqlExpression parameter)
             => PgFunctionExpression.CreateWithNamedArguments(
                 "make_interval",
-                new[] { parameter },
-                new[] { datePart },
+                [parameter],
+                [datePart],
                 nullable: true,
                 argumentsPropagateNullability: TrueArrays[1],
                 builtIn: true,

diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/IntervalRangeMapping.cs b/src/EFCore.PG.NodaTime/Storage/Internal/IntervalRangeMapping.cs
@@ -1,7 +1,8 @@
-// ReSharper disable once CheckNamespace
+
 
 using System.Text;
 using NodaTime.Text;
+// ReSharper disable once CheckNamespace
 using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal.Mapping;
 
 // ReSharper disable once CheckNamespace

diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/LegacyTimestampInstantMapping.cs b/src/EFCore.PG.NodaTime/Storage/Internal/LegacyTimestampInstantMapping.cs
@@ -88,7 +88,9 @@ protected override string GenerateNonNullSqlLiteral(object value)
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     protected override string GenerateEmbeddedNonNullSqlLiteral(object value)
-        => $@"""{GenerateLiteralCore(value)}""";
+        => $"""
+            "{GenerateLiteralCore(value)}"
+            """;
 
     private string GenerateLiteralCore(object value)
     {

diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/PeriodIntervalMapping.cs b/src/EFCore.PG.NodaTime/Storage/Internal/PeriodIntervalMapping.cs
@@ -94,7 +94,9 @@ protected override string GenerateNonNullSqlLiteral(object value)
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     protected override string GenerateEmbeddedNonNullSqlLiteral(object value)
-        => $@"""{GenerateLiteralCore(value)}""";
+        => $"""
+            "{GenerateLiteralCore(value)}"
+            """;
 
     private string GenerateLiteralCore(object value)
         => PeriodPattern.NormalizingIso.Format((Period)value);

diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/TimeTzMapping.cs b/src/EFCore.PG.NodaTime/Storage/Internal/TimeTzMapping.cs
@@ -111,7 +111,9 @@ protected override string GenerateNonNullSqlLiteral(object value)
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     protected override string GenerateEmbeddedNonNullSqlLiteral(object value)
-        => $@"""{Pattern.Format((OffsetTime)value)}""";
+        => $"""
+            "{Pattern.Format((OffsetTime)value)}"
+            """;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/TimestampLocalDateTimeMapping.cs b/src/EFCore.PG.NodaTime/Storage/Internal/TimestampLocalDateTimeMapping.cs
@@ -97,7 +97,9 @@ protected override string GenerateNonNullSqlLiteral(object value)
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     protected override string GenerateEmbeddedNonNullSqlLiteral(object value)
-        => $@"""{Format((LocalDateTime)value)}""";
+        => $"""
+            "{Format((LocalDateTime)value)}"
+            """;
 
     private static string Format(LocalDateTime localDateTime)
     {

diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/TimestampTzInstantMapping.cs b/src/EFCore.PG.NodaTime/Storage/Internal/TimestampTzInstantMapping.cs
@@ -1,4 +1,3 @@
-using System.Globalization;
 using System.Text.Json;
 using Microsoft.EntityFrameworkCore.Storage.Json;
 using NodaTime.Text;
@@ -88,7 +87,9 @@ protected override string GenerateNonNullSqlLiteral(object value)
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     protected override string GenerateEmbeddedNonNullSqlLiteral(object value)
-        => $@"""{Format((Instant)value)}""";
+        => $"""
+            "{Format((Instant)value)}"
+            """;
 
     private static string Format(Instant instant)
     {

diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/TimestampTzOffsetDateTimeMapping.cs b/src/EFCore.PG.NodaTime/Storage/Internal/TimestampTzOffsetDateTimeMapping.cs
@@ -97,7 +97,9 @@ protected override string GenerateNonNullSqlLiteral(object value)
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     protected override string GenerateEmbeddedNonNullSqlLiteral(object value)
-        => $@"""{Format((OffsetDateTime)value)}""";
+        => $"""
+            "{Format((OffsetDateTime)value)}"
+            """;
 
     private static string Format(OffsetDateTime offsetDateTime)
         => OffsetDateTimePattern.ExtendedIso.Format(offsetDateTime);

diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/TimestampTzZonedDateTimeMapping.cs b/src/EFCore.PG.NodaTime/Storage/Internal/TimestampTzZonedDateTimeMapping.cs
@@ -93,7 +93,9 @@ protected override string GenerateNonNullSqlLiteral(object value)
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     protected override string GenerateEmbeddedNonNullSqlLiteral(object value)
-        => $@"""{Pattern.Format((ZonedDateTime)value)}""";
+        => $"""
+            "{Pattern.Format((ZonedDateTime)value)}"
+            """;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

diff --git a/src/EFCore.PG/Extensions/ExpressionVisitorExtensions.cs b/src/EFCore.PG/Extensions/ExpressionVisitorExtensions.cs
@@ -3,8 +3,6 @@
 // ReSharper disable once CheckNamespace
 namespace System.Linq.Expressions;
 
-#nullable enable
-
 [DebuggerStepThrough]
 internal static class ExpressionVisitorExtensions
 {

diff --git a/src/EFCore.PG/Extensions/MetadataExtensions/NpgsqlPropertyExtensions.cs b/src/EFCore.PG/Extensions/MetadataExtensions/NpgsqlPropertyExtensions.cs
@@ -1,4 +1,3 @@
-using Npgsql.EntityFrameworkCore.PostgreSQL.Internal;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata.Internal;