Skip to content

Commit da759ab

Browse files
author
Viktor Tochonov
committed
Revert Implemented IN case
1 parent 2dfff16 commit da759ab

File tree

2 files changed

+0
-40
lines changed

2 files changed

+0
-40
lines changed

src/FSharp.Data.GraphQL.Server.Middleware/ObjectListFilter.fs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ type ObjectListFilter =
1313
| Equals of FieldFilter<System.IComparable>
1414
| GreaterThan of FieldFilter<System.IComparable>
1515
| LessThan of FieldFilter<System.IComparable>
16-
| In of FieldFilter<System.IComparable list>
1716
| StartsWith of FieldFilter<string>
1817
| EndsWith of FieldFilter<string>
1918
| Contains of FieldFilter<string>
@@ -180,11 +179,6 @@ module ObjectListFilter =
180179
Expression.Call (getEnumerableContainsMethod field.FieldType, Expression.PropertyOrField (param, f.FieldName), Expression.Constant (f.Value))
181180
| _ ->
182181
Expression.Call (``member``, StringContainsMethod, Expression.Constant (f.Value))
183-
| In f ->
184-
let ``member`` = Expression.PropertyOrField (param, f.FieldName)
185-
let values = f.Value |> List.map (fun v -> Expression.Equal(``member``, Expression.Constant(v)))
186-
(values |> List.reduce (fun acc expr -> Expression.OrElse(acc, expr))) :> Expression
187-
188182
| OfTypes types ->
189183
types
190184
|> Seq.map (fun t -> buildTypeDiscriminatorCheck param t)

tests/FSharp.Data.GraphQL.Tests/ObjectListFilterLinqTests.fs

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -119,40 +119,6 @@ let ``ObjectListFilter works with OR operator``() =
119119
result.Contact |> equals { Email = "[email protected]" }
120120
result.Friends |> equals [ { Email = "[email protected]" }; { Email = "[email protected]" } ]
121121

122-
[<Fact>]
123-
let ``ObjectListFilter works with IN operator for string type field``() =
124-
let filter =
125-
In { FieldName = "firstName"; Value = ["Jeneffer"; "Ben"] }
126-
let queryable = data.AsQueryable()
127-
let filteredData = queryable.Apply(filter) |> Seq.toList
128-
List.length filteredData |> equals 2
129-
let result = List.head filteredData
130-
result.ID |> equals 4
131-
result.FirstName |> equals "Ben"
132-
result.LastName |> equals "Adams"
133-
result.Contact |> equals { Email = "[email protected]" }
134-
result.Friends |> equals [ { Email = "[email protected]" }; { Email = "[email protected]" } ]
135-
let result2 = List.last filteredData
136-
result2.ID |> equals 7
137-
result2.FirstName |> equals "Jeneffer"
138-
result2.LastName |> equals "Trif"
139-
result2.Contact |> equals { Email = "[email protected]" }
140-
result2.Friends |> equals [ { Email = "[email protected]" } ]
141-
142-
[<Fact>]
143-
let ``ObjectListFilter works with IN operator for int type field``() =
144-
let filter =
145-
In { FieldName = "id"; Value = [4; 2; 7] }
146-
let queryable = data.AsQueryable()
147-
let filteredData = queryable.Apply(filter) |> Seq.toList
148-
List.length filteredData |> equals 3
149-
let result = List.head filteredData
150-
result.ID |> equals 4
151-
result.FirstName |> equals "Ben"
152-
result.LastName |> equals "Adams"
153-
result.Contact |> equals { Email = "[email protected]" }
154-
result.Friends |> equals [ { Email = "[email protected]" }; { Email = "[email protected]" } ]
155-
156122
[<Fact>]
157123
let ``ObjectListFilter works with FilterField operator``() =
158124
let filter =

0 commit comments

Comments
 (0)