Skip to content

Allow empty values for numbers and parse string to numbers if needed #10

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

Open
ddidgdimitrov-infragistics wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow empty values for numbers and parse string to numbers if needed #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion QueryExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,12 @@ private static Expression GetSearchValue(object? searchValue, Type targetType)
}

var jsonVal = JsonValue.Create(searchValue);

if (string.IsNullOrWhiteSpace(jsonVal?.ToString()) && targetType != typeof(string))
{
return GetEmptyValue(targetType);
}

var valueKind = jsonVal?.GetValueKind();
if (valueKind == null || valueKind == JsonValueKind.Null || valueKind == JsonValueKind.Undefined)
{
Expand Down Expand Up @@ -293,7 +299,7 @@ private static Expression GetSearchValue(object? searchValue, Type targetType)
}
}

var value = jsonVal.Deserialize(targetType);
var value = jsonVal.Deserialize(targetType, new JsonSerializerOptions { NumberHandling = JsonNumberHandling.AllowReadingFromString });

var convertedValue = Convert.ChangeType(value, nonNullableType, CultureInfo.InvariantCulture);
return Expression.Constant(convertedValue, targetType);
Expand Down
Loading