More analyzer fixes

Author: rhuijben

src/RepoDb/Cachers/DbRuntimeSettingCache.cs

@@ -4,7 +4,7 @@
 namespace RepoDb;
 public static class DbRuntimeSettingCache
 {
-    private static readonly ConcurrentDictionary<int, DbRuntimeSetting> cache = new();
+    private static readonly ConcurrentDictionary<(Type, string), DbRuntimeSetting> cache = new();
 
     #region Helpers
 
@@ -43,18 +43,13 @@ public static DbRuntimeSetting Get(IDbConnection connection, IDbTransaction? tra
     internal static DbRuntimeSetting GetInternal(IDbConnection connection,
         IDbTransaction? transaction)
     {
-        var key = HashCode.Combine(connection.GetType(), connection.Database);
+        var key = (connection.GetType(), connection.Database);
 
         var result = cache.GetOrAdd(key,
             (_) => connection.GetDbHelper().GetDbConnectionRuntimeInformation(connection, transaction));
 
         // Validate
-        if (result is null)
-        {
-            throw new InvalidOperationException($"There is no database engine version available");
-        }
-
-        return result;
+        return result ?? throw new InvalidOperationException($"There is no database engine version available");
     }
 
     #endregion
@@ -88,7 +83,7 @@ internal static async ValueTask<DbRuntimeSetting> GetInternalAsync(IDbConnection
         IDbTransaction? transaction,
         CancellationToken cancellationToken = default)
     {
-        var key = HashCode.Combine(connection.GetType(), connection.Database);
+        var key = (connection.GetType(), connection.Database);
 
         // Try get the value
         if (cache.TryGetValue(key, out var result) == false)

src/RepoDb/Contexts/Providers/ExecutionContextProvider.cs

@@ -21,19 +21,14 @@ internal static class ExecutionContextProvider
         var primaryField = GetPrimaryAsReturnKeyField(entityType, dbFields);
         var identityField = GetIdentityAsReturnKeyField(entityType, dbFields);
 
-        switch (GlobalConfiguration.Options.KeyColumnReturnBehavior)
+        return GlobalConfiguration.Options.KeyColumnReturnBehavior switch
         {
-            case KeyColumnReturnBehavior.Primary:
-                return primaryField;
-            case KeyColumnReturnBehavior.Identity:
-                return identityField;
-            case KeyColumnReturnBehavior.PrimaryOrElseIdentity:
-                return primaryField ?? identityField;
-            case KeyColumnReturnBehavior.IdentityOrElsePrimary:
-                return identityField ?? primaryField;
-            default:
-                throw new InvalidOperationException(nameof(GlobalConfiguration.Options.KeyColumnReturnBehavior));
-        }
+            KeyColumnReturnBehavior.Primary => primaryField,
+            KeyColumnReturnBehavior.Identity => identityField,
+            KeyColumnReturnBehavior.PrimaryOrElseIdentity => primaryField ?? identityField,
+            KeyColumnReturnBehavior.IdentityOrElsePrimary => identityField ?? primaryField,
+            _ => throw new InvalidOperationException(nameof(GlobalConfiguration.Options.KeyColumnReturnBehavior)),
+        };
     }
 
     /// <summary>

src/RepoDb/Extensions/StringExtension.cs

@@ -106,7 +106,7 @@ public static string AsUnquoted(this string value,
         AsUnquoted(value, false, dbSetting);
 
 #if NET8_0_OR_GREATER
-    static SearchValues<char> unquotedChars = SearchValues.Create(['`', '"', ' ', '[']);
+    static readonly SearchValues<char> unquotedChars = SearchValues.Create(['`', '"', ' ', '[']);
 #endif
     /// <summary>
     /// Unquotes a string.

src/RepoDb/Operations/DbConnection/Average.cs

@@ -1279,7 +1279,7 @@ internal static async ValueTask<object> AverageInternalAsync<TEntity>(
             statementBuilder);
 
         // Converts to property mapped object
-        var param = (where != null) ? await QueryGroup.AsMappedObjectAsync([where.MapTo<TEntity>()], connection, transaction, ClassMappedNameCache.Get<TEntity>()) : null;
+        var param = (where != null) ? await QueryGroup.AsMappedObjectAsync([where.MapTo<TEntity>()], connection, transaction, ClassMappedNameCache.Get<TEntity>(), cancellationToken) : null;
 
         // Return the result
         return await AverageInternalBaseAsync<object>(connection: connection,
@@ -1730,7 +1730,7 @@ internal static async ValueTask<TResult> AverageInternalAsync<TEntity, TResult>(
             statementBuilder);
 
         // Converts to property mapped object
-        var param = (where != null) ? await QueryGroup.AsMappedObjectAsync([where.MapTo<TEntity>()], connection, transaction, ClassMappedNameCache.Get<TEntity>()) : null;
+        var param = (where != null) ? await QueryGroup.AsMappedObjectAsync([where.MapTo<TEntity>()], connection, transaction, ClassMappedNameCache.Get<TEntity>(), cancellationToken) : null;
 
         // Return the result
         return await AverageInternalBaseAsync<TResult>(connection: connection,
@@ -2346,7 +2346,7 @@ internal static async ValueTask<object> AverageInternalAsync(this IDbConnection
         var param = (where != null) ? await QueryGroup.AsMappedObjectAsync([where.MapTo(null)], connection, transaction, tableName, cancellationToken) : null;
 
         // Return the result
-        return AverageInternalBaseAsync<object>(connection: connection,
+        return await AverageInternalBaseAsync<object>(connection: connection,
             request: request,
             param: param,
             commandTimeout: commandTimeout,
@@ -2558,7 +2558,7 @@ internal static async ValueTask<TResult> AverageInternalAsync<TResult>(this IDbC
             statementBuilder);
 
         // Converts to property mapped object
-        var param = (where != null) ? await QueryGroup.AsMappedObject([where.MapTo(null)], connection, transaction, tableName, cancellationToken) : null;
+        var param = (where != null) ? await QueryGroup.AsMappedObjectAsync([where.MapTo(null)], connection, transaction, tableName, cancellationToken) : null;
 
         // Return the result
         return await AverageInternalBaseAsync<TResult>(connection: connection,

src/RepoDb/Operations/DbConnection/Count.cs

@@ -451,7 +451,7 @@ internal static async ValueTask<long> CountInternalAsync<TEntity>(this IDbConnec
         }
 
         // Return the result
-        return CountInternalBaseAsync(connection: connection,
+        return await CountInternalBaseAsync(connection: connection,
             request: request,
             param: param,
             commandTimeout: commandTimeout,

src/RepoDb/Operations/DbConnection/Max.cs

@@ -1269,7 +1269,7 @@ internal static async ValueTask<object> MaxInternalAsync<TEntity>(this IDbConnec
             statementBuilder);
 
         // Converts to property mapped object
-        var param = (where != null) ? await QueryGroup.AsMappedObjectAsync([where.MapTo<TEntity>()], connection, transaction, ClassMappedNameCache.Get<TEntity>()) : null;
+        var param = (where != null) ? await QueryGroup.AsMappedObjectAsync([where.MapTo<TEntity>()], connection, transaction, ClassMappedNameCache.Get<TEntity>(), cancellationToken) : null;
 
         // Return the result
         return await MaxInternalBaseAsync<object>(connection: connection,

src/RepoDb/Operations/DbConnection/Merge.cs

@@ -736,9 +736,6 @@ internal static TResult MergeInternal<TEntity, TResult>(
         ITrace? trace = null, IStatementBuilder? statementBuilder = null)
         where TEntity : class
     {
-        // Variables needed
-        var setting = connection.GetDbSetting();
-
         // Return the result
         if (TypeCache.Get(GetEntityType(entity)).IsDictionaryStringObject() == true)
         {

src/RepoDb/Operations/DbConnection/Min.cs

@@ -1720,7 +1720,7 @@ internal static async ValueTask<TResult> MinInternalAsync<TEntity, TResult>(this
             statementBuilder);
 
         // Converts to property mapped object
-        var param = (where != null) ? await QueryGroup.AsMappedObject([where.MapTo<TEntity>()], connection, transaction, ClassMappedNameCache.Get<TEntity>(), cancellationToken) : null;
+        var param = (where != null) ? await QueryGroup.AsMappedObjectAsync([where.MapTo<TEntity>()], connection, transaction, ClassMappedNameCache.Get<TEntity>(), cancellationToken) : null;
 
         // Return the result
         return await MinInternalBaseAsync<TResult>(connection: connection,