Fix some issue

BatchDelete: FIX issue with EF Core + Multiple keys
BatchDelete: Add support to ObjectContext
BatchUpdate: Add support to ObjectContext
QueryFilterInterceptor: Fix issue with Global Filter

Author: zzzprojects

src/shared/Z.EF.Plus.BatchDelete.Shared/BatchDelete.cs

@@ -592,6 +592,7 @@ public DbCommand CreateCommand(IQueryable query, IEntityType entity)
 
             if (isSqlServer)
             {
+                List<Tuple<string, string>> propertyAndColumnName = new List<Tuple<string, string>>();
                 var sqlServer = (IRelationalEntityTypeAnnotations)dynamicProviderEntityType.Invoke(null, new[] { entity });
 
                 // GET mapping
@@ -605,11 +606,14 @@ public DbCommand CreateCommand(IQueryable query, IEntityType entity)
                     var mappingProperty = dynamicProviderProperty.Invoke(null, new[] { propertyKey });
 
                     var columnNameProperty = mappingProperty.GetType().GetProperty("ColumnName", BindingFlags.Public | BindingFlags.Instance);
-                    columnKeys.Add((string)columnNameProperty.GetValue(mappingProperty));
+                    //columnKeys.Add((string)columnNameProperty.GetValue(mappingProperty));
+                    propertyAndColumnName.Add(new Tuple<string, string>(propertyKey.Name, (string)columnNameProperty.GetValue(mappingProperty)));
                 }
 
                 // GET primary key join
-                primaryKeys = string.Join(Environment.NewLine + "AND ", columnKeys.Select(x => string.Concat("A.[", x, "] = B.[", x, "]")));
+                primaryKeys = propertyAndColumnName.Count > 1?
+                    string.Join(Environment.NewLine + "AND ", propertyAndColumnName.Select(x => string.Concat("A.[", x.Item2, "] = B.[", x.Item1, "]"))):
+                    string.Join(Environment.NewLine + "AND ", propertyAndColumnName.Select(x => string.Concat("A.[", x.Item2, "] = B.[", x.Item2, "]")));
             }
             else if (isPostgreSQL)
             {

src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptorDbScanExpression.cs

@@ -98,12 +98,33 @@ public DbExpression ApplyFilter(DbExpression baseExpression, string fullName)
 
                         if (expression2 != null)
                         {
-                            var visitor = new QueryFilterInterceptorDbProjectExpression();
-                            visitor.DbScanExpression = baseExpression;
-                            visitor.ParameterCollection = QueryFilterManager.DbExpressionParameterByHook[expression2];
+                            var baseExpressionProperty = baseExpression as DbPropertyExpression;
+                            NavigationProperty navProp = null;
+
+                            if (baseExpressionProperty != null)
+                            {
+                                navProp = baseExpressionProperty.Property as NavigationProperty;
+                            }
+
+                            if (QueryFilterManager.AllowPropertyFilter && navProp != null && !baseExpression.ResultType.ToString().Contains("Transient.collection["))
+                            {
+                                // Filter property
+                                expression2 = DbExpressionBuilder.Take(expression2, 1);
+                                expression2 = DbExpressionBuilder.Element(expression2);
 
-                            var filetered = expression2.Accept(visitor);
-                            baseExpression = filetered;
+                                baseExpression = expression2;
+
+                            }
+                            else
+                            {
+                                var visitor = new QueryFilterInterceptorDbProjectExpression();
+                                visitor.DbScanExpression = baseExpression;
+                                visitor.ParameterCollection = QueryFilterManager.DbExpressionParameterByHook[expression2];
+
+                                var filetered = expression2.Accept(visitor);
+
+                                baseExpression = filetered;
+                            }
                         }
                     }
                 }

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

@@ -310,6 +310,7 @@ public IEnumerator<T> GetQueryEnumerator<T>(DbDataReader reader)
             var enumerator = (IEnumerator<T>)getEnumerator;
             return enumerator;
 #elif EFCORE
+           
             ((CreateEntityConnection)QueryConnection.DbConnection).OriginalDataReader = reader;
             var queryExecutor = (Func<QueryContext, IEnumerable<T>>) QueryExecutor;
             var queryEnumerable = queryExecutor(QueryContext);

src/shared/Z.EF.Plus.QueryIncludeOptimized.Shared/QueryIncludeOptimizedProvider.cs

@@ -168,9 +168,10 @@ public TResult Execute<TResult>(Expression expression)
             // RESOLE parent queries using .FutureValue();
 #if EF5 || EF6
             var objectQuery = CurrentQueryable.OriginalQueryable.GetObjectQuery();
-         
-            // GET provider
-            var objectQueryProviderField = typeof (ObjectQuery).GetProperty("ObjectQueryProvider", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+
+            // GET provider 
+            //  because IQueryable.Provider call : ObjectQueryProvider and now that work for EF5
+            var objectQueryProviderField = typeof (ObjectQuery).GetProperty("System.Linq.IQueryable.Provider", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
             var provider = (IQueryProvider) objectQueryProviderField.GetValue(objectQuery, null);
 
             // CREATE query from the expression

src/shared/Z.EF.Plus._Core.Shared/EF6/ObjectContext/GetDbContext.cs

@@ -26,7 +26,15 @@ public static DbContext GetDbContext(this ObjectContext context)
             {
                 return null;
             }
-            return interceptionContext.DbContexts.FirstOrDefault();
+
+            var dbContext = interceptionContext.DbContexts.FirstOrDefault();
+
+            if (dbContext == null)
+            {
+                dbContext = new DbContext(context, false);
+            }
+
+            return dbContext;
         }
     }
 }