#849 - Fixes for the Dynamic MergeAll Issue

mikependon · Jul 29, 2021 · 4331815 · 4331815
1 parent 21dce5c
commit 4331815
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/RepoDb.Core/RepoDb/Extensions/DbConnectionExtension.cs b/RepoDb.Core/RepoDb/Extensions/DbConnectionExtension.cs
@@ -2652,7 +2652,7 @@ internal static IEnumerable<Field> GetQualifiedFields<TEntity>(TEntity entity)
         /// <returns></returns>
         internal static IEnumerable<Field> GetQualifiedFields<TEntity>(IEnumerable<Field> fields)
             where TEntity : class =>
-            fields ?? (typeof(TEntity).IsDictionaryStringObject() == false ? FieldCache.Get<TEntity>() : null);
+            (fields ?? (typeof(TEntity).IsDictionaryStringObject() == false ? FieldCache.Get<TEntity>() : null)).AsList();
 
         /// <summary>
         ///
@@ -2664,7 +2664,7 @@ internal static IEnumerable<Field> GetQualifiedFields<TEntity>(IEnumerable<Field
         internal static IEnumerable<Field> GetQualifiedFields<TEntity>(IEnumerable<Field> fields,
             TEntity entity)
             where TEntity : class =>
-            fields ?? GetQualifiedFields(entity);
+            (fields ?? GetQualifiedFields(entity)).AsList();
 
         /// <summary>
         ///
@@ -2849,7 +2849,7 @@ private static DbCommand CreateDbCommandForExecutionInternal(this IDbConnection
                 var propertiesToSkip = commandArrayParametersText?.CommandArrayParameters?
                     .Select(cap => cap.ParameterName)
                     .ToHashSet(StringComparer.OrdinalIgnoreCase);
-                
+
                 command.CreateParameters(param,
                     propertiesToSkip,
                     entityType,