Commit 5ffa4fb

authored

Merge pull request #1252 from json-api-dotnet/filter-fix

Fixed: fail on non-leading whitespace in field chains

2 parents 1664331 + 6bb377f commit 5ffa4fbCopy full SHA for 5ffa4fb

File tree

2 files changed

-1

lines changed

src/JsonApiDotNetCore/Queries/Internal/Parsing
- QueryTokenizer.cs
test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters
- FilterParseTests.cs

2 files changed

-1

lines changed

`‎src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryTokenizer.cs`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public IEnumerable<Token> EnumerateTokens()`
`87`	`87`	`}`
`88`	`88`	`else`
`89`	`89`	`{`
`90`		`- if (_textBuffer.Length==0&&ch == ' ' && !_isInQuotedSection)`
	`90`	`+ if (ch == ' ' && !_isInQuotedSection)`
`91`	`91`	`{`
`92`	`92`	`throw new QueryParseException("Unexpected whitespace.");`
`93`	`93`	`}`

`‎test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/FilterParseTests.cs`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,13 +66,16 @@ public void Reader_Is_Enabled(JsonApiQueryStringParameters parametersDisabled, b`
`66`	`66`	`[InlineData("filter[posts]", "equals(author,'some')", "Attribute 'author' does not exist on resource type 'blogPosts'.")]`
`67`	`67`	`[InlineData("filter[posts]", "lessThan(author,null)", "Attribute 'author' does not exist on resource type 'blogPosts'.")]`
`68`	`68`	`[InlineData("filter", " ", "Unexpected whitespace.")]`
	`69`	`+ [InlineData("filter", "contains(owner.displayName ,)", "Unexpected whitespace.")]`
`69`	`70`	`[InlineData("filter", "contains(owner.displayName, )", "Unexpected whitespace.")]`
`70`	`71`	`[InlineData("filter", "some", "Filter function expected.")]`
`71`	`72`	`[InlineData("filter", "equals", "( expected.")]`
`72`	`73`	`[InlineData("filter", "equals'", "Unexpected ' outside text.")]`
`73`	`74`	`[InlineData("filter", "equals(", "Count function or field name expected.")]`
`74`	`75`	`[InlineData("filter", "equals('1'", "Count function or field name expected.")]`
`75`	`76`	`[InlineData("filter", "equals(count(posts),", "Count function, value between quotes, null or field name expected.")]`
	`77`	`+ [InlineData("filter", "equals(owner..displayName,'')", "Count function or field name expected.")]`
	`78`	`+ [InlineData("filter", "equals(owner.displayName.,'')", "Count function or field name expected.")]`
`76`	`79`	`[InlineData("filter", "equals(title,')", "' expected.")]`
`77`	`80`	`[InlineData("filter", "equals(title,null", ") expected.")]`
`78`	`81`	`[InlineData("filter", "equals(null", "Field 'null' does not exist on resource type 'blogs'.")]`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 5ffa4fb

File tree

2 files changed

2 files changed

`‎src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryTokenizer.cs`

`‎test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/FilterParseTests.cs`

0 commit comments