Update source

Author: JonathanMagnan

src/shared/Z.EF.Plus.QueryCache.Shared/QueryCacheManager.cs

@@ -583,6 +583,7 @@ public static string GetCacheKey(IQueryable query, string[] tags, bool isAsync =
                 sb.Append(";");
                 sb.Append(parameter.Value);
                 sb.AppendLine(";");
+                 
 
                 // Array contient IList
                 if (parameter.Value is IList parameterValues)
@@ -601,6 +602,33 @@ public static string GetCacheKey(IQueryable query, string[] tags, bool isAsync =
                         }
                     }
                 }
+                else if (parameter.Value is IEnumerable<object> enumerable)
+                {
+                    // je prend pour acquit que si cela résout une query EF.Core ne sera résolut qu'une seul fois et qu'après le tracking embarquera...
+                    var paramValueNotIList = enumerable.ToList(); 
+                    
+                    foreach (var param in paramValueNotIList)
+                    {
+                        if (param is DbParameter dbParameter)
+                        {
+                            sb.Append(dbParameter.Value?.ToString() ?? "NULL");
+                            sb.AppendLine(";");
+                        }
+                        else if (param != null)
+                        {
+                            try
+                            { 
+                                sb.Append(param);
+                                sb.AppendLine(";");
+                            }
+                            catch (Exception ex) 
+                            {
+                                // autant string, int et autre je me dit que ça va autant si sa tente de mettre une classe json ou autre sa risque de faire bomb.
+                                throw new Exception("Oops! The JSON? parameter list could not have been appended to create the key");
+                            }
+                        } 
+                    } 
+                }
             }
 #endif
 

src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureBatch.cs

@@ -119,7 +119,7 @@ public void ExecuteQueries()
             }
 #endif
 
-        if (!allowQueryBatch)
+            if (!allowQueryBatch)
             {
                 foreach (var query in Queries)
                 {
@@ -239,12 +239,12 @@ public void ExecuteQueries()
 #if EFCORE
             }
             finally
-            { 
-				if (firstQuery.RestoreConnection != null)
-				{
-					firstQuery.RestoreConnection();
-				}
-			}
+            {
+                if (firstQuery.RestoreConnection != null)
+                {
+                    firstQuery.RestoreConnection();
+                }
+            }
 #endif
         }
 
@@ -297,7 +297,7 @@ public void ExecuteQueries()
 #endif
 #if EFCORE
             try
-            { 
+            {
 #endif
                 var command = CreateCommandCombined(true);
 
@@ -359,15 +359,15 @@ public void ExecuteQueries()
 
 #if EFCORE
             }
-            finally 
-            { 
+            finally
+            {
                 if (firstQuery.RestoreConnection != null)
                 {
                     firstQuery.RestoreConnection();
                 }
-			}
+            }
 #endif
-		}
+        }
 #endif
 
         /// <summary>Creates a new command combining deferred queries.</summary>
@@ -383,11 +383,11 @@ protected DbCommand CreateCommandCombined(bool isAsync = false)
             var isOracleManaged = command.GetType().FullName.Contains("Oracle.ManagedDataAccess");
             var isOracleDevArt = command.GetType().FullName.Contains("Devart");
 
-            var isPostgreSQL = command.GetType().FullName.Contains("Npgsql"); 
+            var isPostgreSQL = command.GetType().FullName.Contains("Npgsql");
 #if EFCORE_3X
             // foreach is broken need stop and new Foreach, a for is better here, but I don't know if is possible Include with logique with new IncludeOptimized in a Where logic or other. In theory I guess yes, in true I don't know.
             // For now I try without check that.
-                for (int i = 0; i < Queries.Count;i++)
+            for (int i = 0; i < Queries.Count; i++)
             {
                 var query = Queries.ElementAt(i);
                 // first check is because parano.
@@ -411,7 +411,7 @@ protected DbCommand CreateCommandCombined(bool isAsync = false)
 
             foreach (var query in Queries)
             {
-            // GENERATE SQL
+                // GENERATE SQL
 #if EF5
                 var sql = query.Query.ToTraceString();
                 var parameters = query.Query.Parameters;
@@ -481,7 +481,7 @@ protected DbCommand CreateCommandCombined(bool isAsync = false)
                 int i = 0;
                 object value;
                 MethodInfo methodeConvertFromProvider;
-                object convertToProvider; 
+                object convertToProvider;
 
                 // UPDATE parameter name
                 foreach (var relationalParameter in parameters)
@@ -542,16 +542,16 @@ protected DbCommand CreateCommandCombined(bool isAsync = false)
                         oldValue = parameterToCheck.Name.Substring(1);
                     }
                     else
-                    { 
+                    {
                         oldValue = relationalParameter.InvariantName;
                     }
                     var newValue = string.Concat("Z_", queryCount, "_", oldValue);
 
                     // CREATE parameter
                     var dbParameter = command.CreateParameter();
-					dbParameter.CopyFrom(relationalParameter, value ?? parameter, newValue, Context);
+                    dbParameter.CopyFrom(relationalParameter, value ?? parameter, newValue, Context);
 
-					if (methodeConvertFromProvider != null)
+                    if (methodeConvertFromProvider != null)
                     {
                         dbParameter.Value = methodeConvertFromProvider.Invoke(convertToProvider, new[] { dbParameter.Value });
                     }
@@ -570,7 +570,7 @@ protected DbCommand CreateCommandCombined(bool isAsync = false)
                             var relationalTypeMapping = (RelationalTypeMapping)relationalTypeMappingProperty.GetValue(relationalParameter);
 
                             if (relationalTypeMapping != null && relationalTypeMapping.StoreType.Equals("citext", StringComparison.OrdinalIgnoreCase))
-                            { 
+                            {
 
                                 var propertyPostgreSQLDBType = dbParameter.GetType().GetProperty("NpgsqlDbType", BindingFlags.Public | BindingFlags.Instance);
 
@@ -603,7 +603,7 @@ protected DbCommand CreateCommandCombined(bool isAsync = false)
 
 
 
-            sb.AppendLine(string.Concat("-- EF+ Query Future: ", queryCount, " of ", Queries.Count));
+                sb.AppendLine(string.Concat("-- EF+ Query Future: ", queryCount, " of ", Queries.Count));
 
                 if (isOracle || isOracleManaged || isOracleDevArt)
                 {
@@ -615,16 +615,16 @@ protected DbCommand CreateCommandCombined(bool isAsync = false)
                     param.Value = DBNull.Value;
 
                     if (isOracle)
-                    { 
-                        SetOracleDbType(command.GetType().Assembly, param, 121); 
+                    {
+                        SetOracleDbType(command.GetType().Assembly, param, 121);
                     }
                     else if (isOracleManaged)
-                    { 
-                        SetOracleManagedDbType(command.GetType().Assembly, param, 121); 
+                    {
+                        SetOracleManagedDbType(command.GetType().Assembly, param, 121);
                     }
                     else if (isOracleDevArt)
-                    { 
-                        SetOracleDevArtDbType(command.GetType().Assembly, param, 7); 
+                    {
+                        SetOracleDevArtDbType(command.GetType().Assembly, param, 7);
                     }