public-mirrors/Sieve
1
0
Fork 0
mirror of https://github.com/Biarity/Sieve.git synced 2024-11-23 05:52:45 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yannick De Paepe 2021-04-27 16:42:41 +02:00
parent 18eedf2e1a
commit 940e057685
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sieve/Models/SieveOptions.cs
View File

@ -9,5 +9,7 @@
public int MaxPageSize { get; set; } = 0; public int MaxPageSize { get; set; } = 0;
public bool ThrowExceptions { get; set; } = false; public bool ThrowExceptions { get; set; } = false;
public string CultureNameOfTypeConversion { get; set; } = "en";
} }
} }

9
Sieve/Services/SieveProcessor.cs
View File

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Reflection; using System.Reflection;
@ -171,6 +172,8 @@ namespace Sieve.Services
return result; return result;
} }
var cultureInfoToUseForTypeConversion = new CultureInfo(_options.Value.CultureNameOfTypeConversion ?? "en");
Expression outerExpression = null; Expression outerExpression = null;
var parameter = Expression.Parameter(typeof(TEntity), "e"); var parameter = Expression.Parameter(typeof(TEntity), "e");
foreach (var filterTerm in model.GetFiltersParsed()) foreach (var filterTerm in model.GetFiltersParsed())
@ -202,7 +205,7 @@ namespace Sieve.Services
var isFilterTermValueNull = filterTermValue.ToLower() == nullFilterValue; var isFilterTermValueNull = filterTermValue.ToLower() == nullFilterValue;
var filterValue = isFilterTermValueNull var filterValue = isFilterTermValueNull
? Expression.Constant(null, property.PropertyType) ? Expression.Constant(null, property.PropertyType)
: ConvertStringValueToConstantExpression(filterTermValue, property, converter); : ConvertStringValueToConstantExpression(filterTermValue, property, converter, cultureInfoToUseForTypeConversion);
if (filterTerm.OperatorIsCaseInsensitive) if (filterTerm.OperatorIsCaseInsensitive)
{ {
@ -275,10 +278,10 @@ namespace Sieve.Services
: Expression.AndAlso(nullCheckExpression, Expression.NotEqual(propertyValue, Expression.Default(propertyValue.Type))); : Expression.AndAlso(nullCheckExpression, Expression.NotEqual(propertyValue, Expression.Default(propertyValue.Type)));
} }
private Expression ConvertStringValueToConstantExpression(string value, PropertyInfo property, TypeConverter converter) private Expression ConvertStringValueToConstantExpression(string value, PropertyInfo property, TypeConverter converter, CultureInfo cultureInfo)
{ {
dynamic constantVal = converter.CanConvertFrom(typeof(string)) dynamic constantVal = converter.CanConvertFrom(typeof(string))
? converter.ConvertFrom(value) ? converter.ConvertFrom(null, cultureInfo, value)
: Convert.ChangeType(value, property.PropertyType); : Convert.ChangeType(value, property.PropertyType);
return GetClosureOverConstant(constantVal, property.PropertyType); return GetClosureOverConstant(constantVal, property.PropertyType);