Various tweaks that came out of PG sync

src/EFCore.Relational/Storage/RelationalSqlGenerationHelper.cs

@@ -74,9 +74,7 @@ public virtual string SingleLineCommentToken
     ///     A valid name based on the candidate name.
     /// </returns>
     public virtual string GenerateParameterName(string name)
-        => name.StartsWith("@", StringComparison.Ordinal)
-            ? name
-            : "@" + name;
+        => name.StartsWith('@') ? name : "@" + name;
 
     /// <summary>
     ///     Writes a valid parameter name for the given candidate name.

test/EFCore.Cosmos.FunctionalTests/EmbeddedDocumentsTest.cs

@@ -720,8 +720,8 @@ protected override object GetAdditionalModelCacheKey(DbContext context)
         public Task InitializeAsync()
             => Task.CompletedTask;
 
-        public Task DisposeAsync()
-            => TestStore.DisposeAsync();
+        public async Task DisposeAsync()
+            => await TestStore.DisposeAsync();
     }
 
     public record class EmbeddedTransportationContextOptions(DbContextOptions Options, Action<ModelBuilder> OnModelCreating);

test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosTestStore.cs

@@ -507,10 +507,7 @@ private static async Task SeedAsync(DbContext context)
         await creator.SeedDataAsync(created: true).ConfigureAwait(false);
     }
 
-    public override void Dispose()
-        => throw new InvalidOperationException("Calling Dispose can cause deadlocks. Use DisposeAsync instead.");
-
-    public override async Task DisposeAsync()
+    public override async ValueTask DisposeAsync()
     {
         if (_initialized
             && _dataFilePath == null)

test/EFCore.CrossStore.FunctionalTests/ConfigurationPatternsTest.cs

@@ -288,19 +288,13 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         public async Task InitializeAsync()
             => ExistingTestStore = await Fixture.CreateTestStoreAsync(SqlServerTestStoreFactory.Instance, StoreName, SeedAsync);
 
-        public Task DisposeAsync()
-        {
-            ExistingTestStore.Dispose();
-            return Task.CompletedTask;
-        }
+        public async Task DisposeAsync()
+            => await ExistingTestStore.DisposeAsync();
     }
 
     public async Task InitializeAsync()
         => ExistingTestStore = await Fixture.CreateTestStoreAsync(SqlServerTestStoreFactory.Instance, StoreName, SeedAsync);
 
-    public Task DisposeAsync()
-    {
-        ExistingTestStore.Dispose();
-        return Task.CompletedTask;
-    }
+    public async Task DisposeAsync()
+        => await ExistingTestStore.DisposeAsync();
 }

test/EFCore.CrossStore.FunctionalTests/EndToEndTest.cs

@@ -64,11 +64,8 @@ protected CrossStoreContext CreateContext()
     public async Task InitializeAsync()
         => TestStore = await Fixture.CreateTestStoreAsync(TestStoreFactory, "CrossStoreTest");
 
-    public Task DisposeAsync()
-    {
-        TestStore.Dispose();
-        return Task.CompletedTask;
-    }
+    public async Task DisposeAsync()
+        => await TestStore.DisposeAsync();
 }
 
 public class InMemoryEndToEndTest(CrossStoreFixture fixture) : EndToEndTest(fixture), IClassFixture<CrossStoreFixture>

test/EFCore.Relational.Specification.Tests/Query/NullSemanticsQueryFixtureBase.cs

@@ -122,26 +122,24 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
         modelBuilder.Entity<NullSemanticsEntity2>().Property(e => e.StringC).IsRequired();
 
         modelBuilder.HasDbFunction(
-            typeof(NullSemanticsQueryFixtureBase).GetMethod(nameof(Cases)),
+            typeof(NullSemanticsQueryFixtureBase).GetMethod(nameof(Cases))!,
             b => b.HasTranslation(
                 args => new CaseExpression(
                 [
                     new CaseWhenClause(args[0], args[1]),
                     new CaseWhenClause(args[2], args[3]),
-                    new CaseWhenClause(args[4], args[5]),
-                ]))
-        );
+                    new CaseWhenClause(args[4], args[5])
+                ])));
 
         modelBuilder.HasDbFunction(
-            typeof(NullSemanticsQueryFixtureBase).GetMethod(nameof(BoolSwitch)),
+            typeof(NullSemanticsQueryFixtureBase).GetMethod(nameof(BoolSwitch))!,
             b => b.HasTranslation(
                 args => new CaseExpression(
                     operand: args[0],
                     [
                         new CaseWhenClause(new SqlConstantExpression(true, typeMapping: BoolTypeMapping.Default), args[1]),
-                        new CaseWhenClause(new SqlConstantExpression(false, typeMapping: BoolTypeMapping.Default), args[2]),
-                    ]))
-        );
+                        new CaseWhenClause(new SqlConstantExpression(false, typeMapping: BoolTypeMapping.Default), args[2])
+                    ])));
     }
 
     public static int? Cases(bool c1, int v1, bool c2, int v2, bool c3, int v3)
@@ -151,9 +149,5 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
             null;
 
     public static int BoolSwitch(bool x, int whenTrue, int whenFalse)
-        => x switch
-        {
-            true => whenTrue,
-            false => whenFalse,
-        };
+        => x ? whenTrue : whenFalse;
 }

test/EFCore.Relational.Specification.Tests/Query/NullSemanticsQueryTestBase.cs

@@ -1973,8 +1973,7 @@ public virtual Task CaseWhen_equal_to_first_or_third_select(bool async)
                             x.StringC == "Foo", 3
                         )
                         == 3),
-            assertOrder: true
-        );
+            assertOrder: true);
 
     [ConditionalTheory]
     [MemberData(nameof(IsAsyncData))]
@@ -1985,10 +1984,8 @@ public virtual Task CaseOpWhen_projection(bool async)
                 .OrderBy(x => x.Id)
                 .Select(
                     x => NullSemanticsQueryFixtureBase.BoolSwitch(
-                        x.StringA == "Foo", 3, 2
-                    )),
-            assertOrder: true
-        );
+                        x.StringA == "Foo", 3, 2)),
+                    assertOrder: true);
 
     [ConditionalTheory]
     [MemberData(nameof(IsAsyncData))]

test/EFCore.Relational.Specification.Tests/TestUtilities/RelationalTestStore.cs

@@ -44,10 +44,10 @@ public override async Task<TestStore> InitializeAsync(
         return this;
     }
 
-    public override void Dispose()
+    public override async ValueTask DisposeAsync()
     {
-        Connection?.Dispose();
-        base.Dispose();
+        await Connection.DisposeAsync();
+        await base.DisposeAsync();
     }
 
     public virtual string NormalizeDelimitersInRawString(string sql)

test/EFCore.Specification.Tests/MonsterFixupTestBase.cs

@@ -10,7 +10,7 @@ namespace Microsoft.EntityFrameworkCore;
 
 #nullable disable
 
-public abstract class MonsterFixupTestBase<TFixture> : IClassFixture<TFixture>, IDisposable
+public abstract class MonsterFixupTestBase<TFixture> : IClassFixture<TFixture>, IAsyncLifetime
     where TFixture : MonsterFixupTestBase<TFixture>.MonsterFixupFixtureBase, new()
 {
     protected MonsterFixupTestBase(TFixture fixture)
@@ -1405,8 +1405,11 @@ protected Task CreateAndSeedDatabase(Func<MonsterContext, Task> seed)
     protected MonsterContext CreateContext()
         => Fixture.CreateContext(Options);
 
-    public virtual void Dispose()
-        => TestStore.Dispose();
+    public Task InitializeAsync()
+        => Task.CompletedTask;
+
+    public virtual async Task DisposeAsync()
+        => await TestStore.DisposeAsync();
 
     public abstract class MonsterFixupFixtureBase : ServiceProviderFixtureBase
     {

test/EFCore.Specification.Tests/Query/NorthwindFunctionsQueryTestBase.cs

@@ -362,7 +362,8 @@ public virtual Task String_Join_with_predicate(bool async)
                 .Select(
                     g => new
                     {
-                        City = g.Key, Customers = string.Join("|", g.Where(e => e.ContactName.Length > 10).Select(e => e.CustomerID))
+                        City = g.Key,
+                        Customers = string.Join("|", g.Where(e => e.ContactName.Length > 10).Select(e => e.CustomerID))
                     }),
             elementSorter: x => x.City,
             elementAsserter: (e, a) =>

test/EFCore.Specification.Tests/SharedStoreFixtureBase.cs

@@ -111,6 +111,6 @@ protected virtual Task CleanAsync(DbContext context)
         return Task.CompletedTask;
     }
 
-    public virtual Task DisposeAsync()
-        => TestStore.DisposeAsync();
+    public virtual async Task DisposeAsync()
+        => await TestStore.DisposeAsync();
 }

test/EFCore.Specification.Tests/TestModels/Northwind/NorthwindContext.cs

@@ -75,11 +75,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             });
 
         modelBuilder.Entity<OrderDetail>(
-            e =>
-            {
-                e.HasKey(
-                    od => new { od.OrderID, od.ProductID });
-            });
+            e => e.HasKey(od => new { od.OrderID, od.ProductID }));
 
         modelBuilder.Entity<CustomerQuery>().HasNoKey();
         modelBuilder.Entity<OrderQuery>().HasNoKey();

test/EFCore.Specification.Tests/TestUtilities/TestStore.cs

@@ -5,7 +5,7 @@
 
 namespace Microsoft.EntityFrameworkCore.TestUtilities;
 
-public abstract class TestStore(string name, bool shared) : IDisposable
+public abstract class TestStore(string name, bool shared) : IAsyncDisposable
 {
     private static readonly TestStoreIndex GlobalTestStoreIndex = new();
     public IServiceProvider? ServiceProvider { get; protected set; }
@@ -83,15 +83,8 @@ protected virtual DbContext CreateDefaultContext()
     protected virtual TestStoreIndex GetTestStoreIndex(IServiceProvider? serviceProvider)
         => GlobalTestStoreIndex;
 
-    public virtual void Dispose()
-    {
-    }
-
-    public virtual Task DisposeAsync()
-    {
-        Dispose();
-        return Task.CompletedTask;
-    }
+    public virtual ValueTask DisposeAsync()
+        => default;
 
     private static readonly SemaphoreSlim _transactionSyncRoot = new(1);
 

test/EFCore.SqlServer.FunctionalTests/ComputedColumnTest.cs

@@ -133,9 +133,6 @@ public void Can_use_computed_columns_with_nullable_enum()
     public async Task InitializeAsync()
         => TestStore = await SqlServerTestStore.CreateInitializedAsync("ComputedColumnTest");
 
-    public Task DisposeAsync()
-    {
-        TestStore.Dispose();
-        return Task.CompletedTask;
-    }
+    public async Task DisposeAsync()
+        => await TestStore.DisposeAsync();
 }