Merge branch 'patch-1' of https://github.com/sfreidahl/OData.QueryBuilder into patch-1

sfreidahl · sfreidahl · commit f998c3aa1796 · 2022-06-07T14:55:22.000+02:00
diff --git a/src/OData.QueryBuilder/Conventions/AddressingEntities/Query/ODataQueryCollection.cs b/src/OData.QueryBuilder/Conventions/AddressingEntities/Query/ODataQueryCollection.cs
@@ -137,11 +137,11 @@ private IODataQueryCollection<TEntity> Filter(string query)
         {
             if (_hasMultyFilters)
             {
-                _stringBuilder.Merge(ODataOptionNames.Filter, QuerySeparators.Main, $" {ODataLogicalOperations.And} {query}");
+                _stringBuilder.Merge(ODataOptionNames.Filter, QuerySeparators.Main, $" {ODataLogicalOperations.And} ({query})");
             }
             else
             {
-                _stringBuilder.Append($"{ODataOptionNames.Filter}{QuerySeparators.EqualSign}{query}{QuerySeparators.Main}");
+                _stringBuilder.Append($"{ODataOptionNames.Filter}{QuerySeparators.EqualSign}({query}){QuerySeparators.Main}");
             }
 
             _hasMultyFilters = true;

Original file line number	Diff line number	Diff line change
`@@ -137,11 +137,11 @@ private IODataQueryCollection<TEntity> Filter(string query)`
`137`	`137`	`{`
`138`	`138`	`if (_hasMultyFilters)`
`139`	`139`	`{`
`140`		`- _stringBuilder.Merge(ODataOptionNames.Filter, QuerySeparators.Main, $" {ODataLogicalOperations.And} {query}");`
	`140`	`+ _stringBuilder.Merge(ODataOptionNames.Filter, QuerySeparators.Main, $" {ODataLogicalOperations.And} ({query})");`
`141`	`141`	`}`
`142`	`142`	`else`
`143`	`143`	`{`
`144`		`- _stringBuilder.Append($"{ODataOptionNames.Filter}{QuerySeparators.EqualSign}{query}{QuerySeparators.Main}");`
	`144`	`+ _stringBuilder.Append($"{ODataOptionNames.Filter}{QuerySeparators.EqualSign}({query}){QuerySeparators.Main}");`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`_hasMultyFilters = true;`