Add DisableCollectionNullChecks and EntityFrameworkCompatibilityLayer in the mapper configuration

src/Gridify/Builder/BaseQueryBuilder.cs

@@ -133,9 +133,9 @@ public TQuery Build(ExpressionSyntax expression)
       return ((TQuery)query, false);
    }
 
-   private static object AddIndexerNullCheck(LambdaExpression mapTarget, object query)
+   private object AddIndexerNullCheck(LambdaExpression mapTarget, object query)
    {
-      if (GridifyGlobalConfiguration.DisableNullChecks || GridifyGlobalConfiguration.EntityFrameworkCompatibilityLayer)
+      if (mapper.Configuration.DisableCollectionNullChecks || mapper.Configuration.EntityFrameworkCompatibilityLayer)
          return query;
 
       var body = mapTarget.Body;
@@ -199,7 +199,7 @@ private static object AddIndexerNullCheck(LambdaExpression mapTarget, object que
             {
                return BuildAlwaysFalseQuery(parameter);
             }
-         
+
          if (value is DateTime dateTime)
          {
             if (mapper.Configuration.DefaultDateTimeKind.HasValue)
@@ -219,10 +219,10 @@ private static object AddIndexerNullCheck(LambdaExpression mapTarget, object que
       {
          var strLowerValue = value.ToString()?.ToLower();
          value = strLowerValue;
-         
-         if(!string.IsNullOrEmpty(strLowerValue))
+
+         if (!string.IsNullOrEmpty(strLowerValue))
          {
-            body = Expression.Call(body, MethodInfoHelper.GetToLowerMethod());   
+            body = Expression.Call(body, MethodInfoHelper.GetToLowerMethod());
          }
       }
 

src/Gridify/Builder/LinqQueryBuilder.cs

@@ -7,7 +7,7 @@
 
 namespace Gridify.Builder;
 
 public class LinqQueryBuilder<T>(IGridifyMapper<T> mapper) : BaseQueryBuilder<Expression<Func<T, bool>>, T>(mapper)
 {
    protected override Expression<Func<T, bool>>? BuildNestedQuery(
       Expression body, IGMap<T> gMap, ValueExpressionSyntax value, ISyntaxNode op)
@@ -297,7 +297,7 @@
          }
    }
 
-   private static LambdaExpression ParseMethodCallExpression(MethodCallExpression exp, LambdaExpression predicate, ISyntaxNode op)
+   private LambdaExpression ParseMethodCallExpression(MethodCallExpression exp, LambdaExpression predicate, ISyntaxNode op)
    {
       switch (exp.Arguments.First())
       {
@@ -349,7 +349,7 @@
       }
    }
 
-   private static LambdaExpression GetContainsExpression(MemberExpression member, BinaryExpression binaryExpression, ISyntaxNode op)
+   private LambdaExpression GetContainsExpression(MemberExpression member, BinaryExpression binaryExpression, ISyntaxNode op)
    {
       var param = GetParameterExpression(member);
       var prop = GetPropertyOrField(member, param);
@@ -393,7 +393,7 @@
       };
    }
 
-   private static LambdaExpression GetAnyExpression(MemberExpression member, Expression predicate)
+   private LambdaExpression GetAnyExpression(MemberExpression member, Expression predicate)
    {
       var param = GetParameterExpression(member);
       var prop = GetPropertyOrField(member, param);
@@ -410,12 +410,11 @@
       return GetExpressionWithNullCheck(prop, param, anyExp);
    }
 
-   private static LambdaExpression GetExpressionWithNullCheck(MemberExpression prop, ParameterExpression param, Expression right)
+   private LambdaExpression GetExpressionWithNullCheck(MemberExpression prop, ParameterExpression param, Expression right)
    {
       // Entityframework doesn't support NullChecking for Collections (issue #58)
       // also issue #70 for NHibernate - and #173
-      if (GridifyGlobalConfiguration.DisableNullChecks ||
-          GridifyGlobalConfiguration.EntityFrameworkCompatibilityLayer)
+      if (mapper.Configuration.DisableCollectionNullChecks || mapper.Configuration.EntityFrameworkCompatibilityLayer)
          return Expression.Lambda(right, param);
 
       var nullChecker = Expression.NotEqual(prop, Expression.Constant(null));
@@ -425,7 +424,7 @@
 
    private Expression GetValueExpression(Type type, object? value)
    {
-      if (!GridifyGlobalConfiguration.EntityFrameworkCompatibilityLayer)
+      if (!mapper.Configuration.EntityFrameworkCompatibilityLayer)
          return Expression.Constant(value, type);
 
       // active parameterized query for EF
@@ -436,7 +435,7 @@
 
    private BinaryExpression GetLessThanOrEqualExpression(Expression body, ValueExpressionSyntax valueExpression, object? value)
    {
-      if (GridifyGlobalConfiguration.EntityFrameworkCompatibilityLayer)
+      if (mapper.Configuration.EntityFrameworkCompatibilityLayer)
          return Expression.LessThanOrEqual(Expression.Call(null, MethodInfoHelper.GetCompareMethod(), body, GetValueExpression(typeof(string), value)),
             Expression.Constant(0));
 
@@ -447,7 +446,7 @@
 
    private BinaryExpression GetGreaterThanOrEqualExpression(Expression body, ValueExpressionSyntax valueExpression, object? value)
    {
-      if (GridifyGlobalConfiguration.EntityFrameworkCompatibilityLayer)
+      if (mapper.Configuration.EntityFrameworkCompatibilityLayer)
          return Expression.GreaterThanOrEqual(Expression.Call(null, MethodInfoHelper.GetCompareMethod(), body, GetValueExpression(typeof(string), value)),
             Expression.Constant(0));
 
@@ -458,7 +457,7 @@
 
    private BinaryExpression GetLessThanExpression(Expression body, ValueExpressionSyntax valueExpression, object? value)
    {
-      if (GridifyGlobalConfiguration.EntityFrameworkCompatibilityLayer)
+      if (mapper.Configuration.EntityFrameworkCompatibilityLayer)
          return Expression.LessThan(Expression.Call(null, MethodInfoHelper.GetCompareMethod(), body, GetValueExpression(typeof(string), value)),
             Expression.Constant(0));
 
@@ -469,7 +468,7 @@
 
    private BinaryExpression GetGreaterThanExpression(Expression body, ValueExpressionSyntax valueExpression, object? value)
    {
-      if (GridifyGlobalConfiguration.EntityFrameworkCompatibilityLayer)
+      if (mapper.Configuration.EntityFrameworkCompatibilityLayer)
          return Expression.GreaterThan(Expression.Call(null, MethodInfoHelper.GetCompareMethod(), body, GetValueExpression(typeof(string), value)),
             Expression.Constant(0));
 

src/Gridify/GridifyGlobalConfiguration.cs

@@ -7,7 +7,7 @@ public static class GridifyGlobalConfiguration
    {
       /// <summary>
       /// It makes the generated expressions compatible
-      /// whit the entity framework.
+      /// with the entity framework.
       /// Default is false.
       /// </summary>
       public static bool EntityFrameworkCompatibilityLayer { get; set; }
@@ -46,14 +46,14 @@ public static class GridifyGlobalConfiguration
       /// Default is false
       /// </summary>
       public static bool DisableNullChecks { get; set; } = false;
-      
+
       /// <summary>
-      /// By default, string comparison is case sensitive.
+      /// By default, string comparison is case-sensitive.
       /// You can change this behavior by setting this property to true.
       /// Default is false
       /// </summary>
       public static bool CaseInsensitiveFiltering { get; set; } = false;
-      
+
       /// <summary>
       /// By default, DateTimeKind.Unspecified is used.
       /// You can change this behavior by setting this property to a DateTimeKind value.

src/Gridify/GridifyMapperConfiguration.cs

@@ -23,20 +23,36 @@ public record GridifyMapperConfiguration
    /// Default is false
    /// </summary>
    public bool IgnoreNotMappedFields { get; set; } = GridifyGlobalConfiguration.IgnoreNotMappedFields;
-   
+
    /// <summary>
-   /// If true, string comparison operations are case insensitive by default.
+   /// If true, string comparison operations are case-insensitive by default.
    /// Default is false
    /// </summary>
    public bool CaseInsensitiveFiltering { get; set; } = GridifyGlobalConfiguration.CaseInsensitiveFiltering;
-   
+
    /// <summary>
    /// By default, DateTimeKind.Unspecified is used.
    /// You can change this behavior by setting this property to a DateTimeKind value.
    /// Default is null
    /// </summary>
    public DateTimeKind? DefaultDateTimeKind { get; set; } = GridifyGlobalConfiguration.DefaultDateTimeKind;
 
+   /// <summary>
+   /// On nested collections by default gridify adds null check condition
+   /// to prevent null reference exceptions, e.g () => field != null && field....
+   /// some ORMs like NHibernate don't support this.
+   /// you can disable this behavior by setting this option to true
+   /// Default is false
+   /// </summary>
+   public bool DisableCollectionNullChecks { get; set; } = GridifyGlobalConfiguration.DisableNullChecks;
+
+   /// <summary>
+   /// It makes the generated expressions compatible
+   /// with the entity framework.
+   /// Default is false.
+   /// </summary>
+   public bool EntityFrameworkCompatibilityLayer { get; set; } = GridifyGlobalConfiguration.EntityFrameworkCompatibilityLayer;
+
    /// <summary>
    /// Specifies how field names are inferred from CLR property names.
    /// By default, Elastic.Clients.Elasticsearch uses camel-case property names.

test/Gridify.Tests/GridifyExtensionsShould.cs

@@ -2,6 +2,7 @@
 using Gridify.Syntax;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
 using Xunit;
@@ -135,7 +136,7 @@ public void ApplyFiltering_NullHandlingUsingCustomConvertor()
       Assert.Equal(expected, actual);
       Assert.True(actual.Any());
    }
-   
+
    [Fact] // issue #220
    public void ApplyFiltering_CustomConvertor_ReturningNull_ShouldWork()
    {
@@ -695,6 +696,20 @@ public void ApplyFiltering_UnmappedFields_ShouldSkipWhenIgnored()
       Assert.True(actual.Any());
    }
 
+   [Fact] // issue #238
+   public void ApplyFiltering_MapperDisableCollectionNullChecks_ShouldPreventAddingNullChecks()
+   {
+      var gm = new GridifyMapper<TestClass>(configuration => configuration.DisableCollectionNullChecks = true)
+               .AddMap("name", q => q.Children.Select(w => w.Name));
+
+#pragma warning disable CS8602 // Dereference of a possibly null reference.
+      var expected = _fakeRepository.AsQueryable().Where(q => q.Children.Any(w => w.Name.Contains("a"))).ToString();
+#pragma warning restore CS8602 // Dereference of a possibly null reference.
+      var actual = _fakeRepository.AsQueryable().ApplyFiltering("name=*a", gm).ToString();
+
+      Assert.Equal(expected, actual);
+   }
+
    #endregion
 
 
@@ -723,6 +738,8 @@ private class TestOperator : UpperCaseEqual
    };
 
    [Fact]
+   [SuppressMessage("Assertions", "xUnit2031:Do not use Where clause with Assert.Single")]
+   [SuppressMessage("Assertions", "xUnit2029:Do not use Assert.Empty to check if a value does not exist in a collection")]
    public void CustomOperator_GenericRegisterAndRemove_ShouldNotThrowAnyException()
    {
       GridifyGlobalConfiguration.CustomOperators.Register<TestOperator>();