Skip to content

Feature/allow leading space #1041

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

Merged
merged 5 commits into from
Sep 1, 2021
Merged

Feature/allow leading space #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d42a274
Tests for leading, trailing, and spaces
sgryphon Aug 18, 2021
34908d9
Allow leading space in literals
sgryphon Aug 18, 2021
45a0672
More meaningful test examples
sgryphon Aug 18, 2021
2ad702c
Review feedback
sgryphon Aug 31, 2021
205223e
Test for unexpected whitespace in the middle (at start of a token)
sgryphon Aug 31, 2021
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
2 changes: 1 addition & 1 deletion src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryTokenizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public IEnumerable<Token> EnumerateTokens()
}
else
{
if (_textBuffer.Length == 0 && ch == ' ')
if (_textBuffer.Length == 0 && ch == ' ' && !_isInQuotedSection)
{
throw new QueryParseException("Unexpected whitespace.");
}
Expand Down
4 changes: 4 additions & 0 deletions test/JsonApiDotNetCoreExampleTests/UnitTests/QueryStringParameters/FilterParseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public void Reader_Is_Enabled(JsonApiQueryStringParameters parametersDisabled, b
[InlineData("filter[posts]", "equals(author,'some')", "Attribute 'author' does not exist on resource 'blogPosts'.")]
[InlineData("filter[posts]", "lessThan(author,null)", "Attribute 'author' does not exist on resource 'blogPosts'.")]
[InlineData("filter", " ", "Unexpected whitespace.")]
[InlineData("filter", "contains(owner.displayName, )", "Unexpected whitespace.")]
[InlineData("filter", "some", "Filter function expected.")]
[InlineData("filter", "equals", "( expected.")]
[InlineData("filter", "equals'", "Unexpected ' outside text.")]
Expand Down Expand Up @@ -115,6 +116,9 @@ public void Reader_Read_Fails(string parameterName, string parameterValue, strin
[InlineData("filter", "equals(title,'Brian O''Quote')", null, "equals(title,'Brian O''Quote')")]
[InlineData("filter", "equals(title,'!@#$%^&*()-_=+\"''[]{}<>()/|\\:;.,`~')", null, "equals(title,'!@#$%^&*()-_=+\"''[]{}<>()/|\\:;.,`~')")]
[InlineData("filter", "equals(title,'')", null, "equals(title,'')")]
[InlineData("filter", "startsWith(owner.displayName,'GivenName ')", null, "startsWith(owner.displayName,'GivenName ')")]
[InlineData("filter", "endsWith(owner.displayName,' Surname')", null, "endsWith(owner.displayName,' Surname')")]
[InlineData("filter", "contains(owner.displayName,' ')", null, "contains(owner.displayName,' ')")]
[InlineData("filter[posts]", "equals(caption,'this, that & more')", "posts", "equals(caption,'this, that & more')")]
[InlineData("filter[owner.posts]", "equals(caption,'some')", "owner.posts", "equals(caption,'some')")]
[InlineData("filter[posts.comments]", "equals(createdAt,'2000-01-01')", "posts.comments", "equals(createdAt,'2000-01-01')")]
Expand Down
2 changes: 1 addition & 1 deletion test/JsonApiDotNetCoreExampleTests/UnitTests/QueryStringParameters/LegacyFilterParseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ public LegacyFilterParseTests()
[InlineData("filter[author]", "some", "Attribute 'author' does not exist on resource 'blogPosts'.")]
[InlineData("filter[author.posts]", "some", "Field 'posts' in 'author.posts' must be an attribute or a to-one relationship on resource 'webAccounts'.")]
[InlineData("filter[unknown.id]", "some", "Relationship 'unknown' in 'unknown.id' does not exist on resource 'blogPosts'.")]
[InlineData("filter[author]", " ", "Unexpected whitespace.")]
[InlineData("filter", "expr:equals(some,'other')", "Field 'some' does not exist on resource 'blogPosts'.")]
[InlineData("filter", "expr:equals(author,'Joe')", "Attribute 'author' does not exist on resource 'blogPosts'.")]
[InlineData("filter", "expr:has(author)", "Relationship 'author' must be a to-many relationship on resource 'blogPosts'.")]
Expand Down Expand Up @@ -75,6 +74,7 @@ public void Reader_Read_Fails(string parameterName, string parameterValue, strin
[InlineData("filter[caption]", "isnull:", "equals(caption,null)")]
[InlineData("filter[caption]", "isnotnull:", "not(equals(caption,null))")]
[InlineData("filter[caption]", "unknown:some", "equals(caption,'unknown:some')")]
[InlineData("filter[caption]", " ", "equals(caption,' ')")]
[InlineData("filter[author.userName]", "Jack", "equals(author.userName,'Jack')")]
[InlineData("filter", "expr:equals(caption,'some')", "equals(caption,'some')")]
[InlineData("filter", "expr:equals(author,null)", "equals(author,null)")]
Expand Down