Cleanup (#2794)

Author: roji

src/EFCore.PG.NodaTime/Storage/Internal/IntervalRangeMapping.cs

@@ -118,7 +118,7 @@ public override Expression GenerateCodeLiteral(object value)
     {
         var interval = (Interval)value;
 
-        return interval.HasStart && interval.HasEnd
+        return interval is { HasStart: true, HasEnd: true }
             ? Expression.New(
                 _constructor,
                 TimestampTzInstantMapping.GenerateCodeLiteral(interval.Start),

src/EFCore.PG.NodaTime/Storage/Internal/TimestampLocalDateTimeMapping.cs

@@ -124,7 +124,7 @@ private string GenerateLiteralCore(object value)
 
     internal static Expression GenerateCodeLiteral(LocalDateTime dateTime)
     {
-        if (dateTime.Second == 0 && dateTime.NanosecondOfSecond == 0)
+        if (dateTime is { Second: 0, NanosecondOfSecond: 0 })
         {
             return ConstantNew(ConstructorWithMinutes, dateTime.Year, dateTime.Month, dateTime.Day, dateTime.Hour, dateTime.Minute);
         }

src/EFCore.PG/Internal/IReadOnlyListExtensions.cs

@@ -9,8 +9,8 @@ public static IReadOnlyList<T> Slice<T>(this IReadOnlyList<T> list, int start)
 
     private sealed class IReadOnlyListSlice<T> : IReadOnlyList<T>
     {
-        private IReadOnlyList<T> _underlying;
-        private int _start;
+        private readonly IReadOnlyList<T> _underlying;
+        private readonly int _start;
 
         internal IReadOnlyListSlice(IReadOnlyList<T> underlying, int start)
         {

src/EFCore.PG/Internal/NpgsqlSingletonOptions.cs

@@ -94,7 +94,6 @@ public virtual void Initialize(IDbContextOptions options)
     public virtual void Validate(IDbContextOptions options)
     {
         var npgsqlOptions = options.FindExtension<NpgsqlOptionsExtension>() ?? new();
-        var coreOptions = options.FindExtension<CoreOptionsExtension>() ?? new();
 
         if (PostgresVersion != npgsqlOptions.PostgresVersion)
         {

src/EFCore.PG/Metadata/Conventions/NpgsqlPostgresModelFinalizingConvention.cs

@@ -71,8 +71,7 @@ protected virtual void DiscoverPostgresExtensions(
     /// </summary>
     protected virtual void ProcessRowVersionProperty(IConventionProperty property, RelationalTypeMapping typeMapping)
     {
-        if (property.ValueGenerated == ValueGenerated.OnAddOrUpdate
-            && property.IsConcurrencyToken
+        if (property is { ValueGenerated: ValueGenerated.OnAddOrUpdate, IsConcurrencyToken: true }
             && typeMapping.StoreType == "xid")
         {
             property.Builder.HasColumnName("xmin");

src/EFCore.PG/Metadata/Internal/NpgsqlAnnotationProvider.cs

@@ -86,8 +86,7 @@ public override IEnumerable<IAnnotation> For(IColumn column, bool designTime)
             var valueGenerationStrategy = valueGeneratedProperty.GetValueGenerationStrategy();
             yield return new Annotation(NpgsqlAnnotationNames.ValueGenerationStrategy, valueGenerationStrategy);
 
-            if (valueGenerationStrategy == NpgsqlValueGenerationStrategy.IdentityByDefaultColumn ||
-                valueGenerationStrategy == NpgsqlValueGenerationStrategy.IdentityAlwaysColumn)
+            if (valueGenerationStrategy is NpgsqlValueGenerationStrategy.IdentityByDefaultColumn or NpgsqlValueGenerationStrategy.IdentityAlwaysColumn)
             {
                 if (valueGeneratedProperty[NpgsqlAnnotationNames.IdentityOptions] is string identityOptions)
                 {

src/EFCore.PG/Metadata/PostgresExtension.cs

@@ -192,7 +192,7 @@ private static (string? Schema, string? Name, string? Version) Deserialize(IAnno
         }
 
         // TODO: Can't actually use schema and name...they might not be set when this is first called.
-        var schemaNameValue = value.Split(',').Select(x => x.Trim()).Select(x => x == "" || x == "''" ? null : x).ToArray();
+        var schemaNameValue = value.Split(',').Select(x => x.Trim()).Select(x => x is "" or "''" ? null : x).ToArray();
         var schemaAndName = annotation.Name.Substring(NpgsqlAnnotationNames.PostgresExtensionPrefix.Length).Split('.');
         switch (schemaAndName.Length)
         {

src/EFCore.PG/Migrations/NpgsqlMigrationsSqlGenerator.cs

@@ -169,7 +169,7 @@ protected override void Generate(
 
         builder.Append("CREATE ");
 
-        if (operation[NpgsqlAnnotationNames.UnloggedTable] is bool unlogged && unlogged)
+        if (operation[NpgsqlAnnotationNames.UnloggedTable] is true)
         {
             builder.Append("UNLOGGED ");
         }
@@ -312,8 +312,8 @@ protected override void Generate(AlterTableOperation operation, IModel? model, M
         }
 
         // Unlogged table (null is equivalent to false)
-        var oldUnlogged = operation.OldTable[NpgsqlAnnotationNames.UnloggedTable] is bool ou && ou;
-        var newUnlogged = operation[NpgsqlAnnotationNames.UnloggedTable] is bool nu && nu;
+        var oldUnlogged = operation.OldTable[NpgsqlAnnotationNames.UnloggedTable] is true;
+        var newUnlogged = operation[NpgsqlAnnotationNames.UnloggedTable] is true;
 
         if (oldUnlogged != newUnlogged)
         {
@@ -511,14 +511,14 @@ protected override void Generate(AlterColumnOperation operation, IModel? model,
             builder.AppendLine(";");
         }
 
-        if (operation.IsNullable && !operation.OldColumn.IsNullable)
+        if (operation is { IsNullable: true, OldColumn.IsNullable: false })
         {
             builder
                 .Append(alterBase)
                 .Append("DROP NOT NULL")
                 .AppendLine(";");
         }
-        else if (!operation.IsNullable && operation.OldColumn.IsNullable)
+        else if (operation is { IsNullable: false, OldColumn.IsNullable: true })
         {
             // The column is being made non-nullable. Generate an update statement before doing that, to convert any existing null values to
             // the default value (otherwise PostgreSQL fails).
@@ -2046,7 +2046,7 @@ private string IndexColumnList(IndexColumn[] columns, string? method)
 
             // Of the built-in access methods, only btree (the default) supports
             // sorting, thus we only want to emit sort options for btree indexes.
-            if (method is null || method == "btree")
+            if (method is null or "btree")
             {
                 if (column.IsDescending)
                 {

src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlArrayMethodTranslator.cs

@@ -17,7 +17,7 @@ public class NpgsqlArrayMethodTranslator : IMethodCallTranslator
     // ReSharper disable InconsistentNaming
     private static readonly MethodInfo Array_IndexOf1 =
         typeof(Array).GetTypeInfo().GetMethods(BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly)
-            .Single(m => m.Name == nameof(Array.IndexOf) && m.IsGenericMethod && m.GetParameters().Length == 2);
+            .Single(m => m is { Name: nameof(Array.IndexOf), IsGenericMethod: true } && m.GetParameters().Length == 2);
 
     private static readonly MethodInfo Array_IndexOf2 =
         typeof(Array).GetTypeInfo().GetMethods(BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly)

src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlJsonDbFunctionsTranslator.cs

@@ -79,7 +79,7 @@ public NpgsqlJsonDbFunctionsTranslator(
         }
 
         // The following are jsonb-only, not support on json
-        if (args.Any(a => a.TypeMapping is NpgsqlJsonTypeMapping jsonMapping && !jsonMapping.IsJsonb))
+        if (args.Any(a => a.TypeMapping is NpgsqlJsonTypeMapping { IsJsonb: false }))
         {
             throw new InvalidOperationException("JSON methods on EF.Functions only support the jsonb type, not json.");
         }
@@ -109,8 +109,7 @@ SqlExpression Jsonb(SqlExpression e)
 
         static SqlExpression RemoveConvert(SqlExpression e)
         {
-            while (e is SqlUnaryExpression unary &&
-                   (unary.OperatorType == ExpressionType.Convert || unary.OperatorType == ExpressionType.ConvertChecked))
+            while (e is SqlUnaryExpression { OperatorType: ExpressionType.Convert or ExpressionType.ConvertChecked } unary)
             {
                 e = unary.Operand;
             }