Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix merge conflicts for: Let you choose the Culture used for TypeConversion in the processor #79 #125

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix merge conflicts for: Let you choose the Culture used for TypeConversion in the processor #79 #125

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
940e057
Fix merge conflicts for: Let you choose the Culture used for TypeConv…
Apr 27, 2021
b992778
Merge branch 'master' into master
hasanmanzak Jan 12, 2022
d03f427
prop name fix
hasanmanzak Jan 12, 2022
80b6c07
Merge branch 'master' into master
ITDancer13 Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Sieve/Models/SieveOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sieve.Models
namespace Sieve.Models
{
public class SieveOptions
{
Expand All @@ -11,5 +11,7 @@ public class SieveOptions
public bool ThrowExceptions { get; set; } = false;

public bool IgnoreNullsOnNotEqual { get; set; } = true;

public string CultureNameOfTypeConversion { get; set; } = "en";
}
}
10 changes: 6 additions & 4 deletions Sieve/Services/SieveProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
Expand Down Expand Up @@ -172,6 +173,8 @@ protected virtual IQueryable<TEntity> ApplyFiltering<TEntity>(TSieveModel model,
return result;
}

var cultureInfoToUseForTypeConversion = new CultureInfo(Options.Value.CultureNameOfTypeConversion ?? "en");

Expression outerExpression = null;
var parameter = Expression.Parameter(typeof(TEntity), "e");
foreach (var filterTerm in model.GetFiltersParsed())
Expand All @@ -198,7 +201,7 @@ protected virtual IQueryable<TEntity> ApplyFiltering<TEntity>(TSieveModel model,

var filterValue = isFilterTermValueNull
? Expression.Constant(null, property.PropertyType)
: ConvertStringValueToConstantExpression(filterTermValue, property, converter);
: ConvertStringValueToConstantExpression(filterTermValue, property, converter, cultureInfoToUseForTypeConversion);

if (filterTerm.OperatorIsCaseInsensitive && !isFilterTermValueNull)
{
Expand Down Expand Up @@ -309,15 +312,14 @@ private static Expression GenerateFilterNullCheckExpression(Expression propertyV
Expression.NotEqual(propertyValue, Expression.Default(propertyValue.Type)));
}

private static Expression ConvertStringValueToConstantExpression(string value, PropertyInfo property,
TypeConverter converter)
private static Expression ConvertStringValueToConstantExpression(string value, PropertyInfo property, TypeConverter converter, CultureInfo cultureInfo)
{
// to allow user to distinguish between prop==null (as null) and prop==\null (as "null"-string)
value = value.Equals(EscapeChar + NullFilterValue, StringComparison.InvariantCultureIgnoreCase)
? value.TrimStart(EscapeChar)
: value;
dynamic constantVal = converter.CanConvertFrom(typeof(string))
? converter.ConvertFrom(value)
? converter.ConvertFrom(null, cultureInfo, value)
: Convert.ChangeType(value, property.PropertyType);

return GetClosureOverConstant(constantVal, property.PropertyType);
Expand Down