Skip to content

Commit 9754837

Browse files
author
Viktor Tochonov
committed
PR fixes
1 parent ef5b3a7 commit 9754837

2 files changed

Lines changed: 33 additions & 40 deletions

File tree

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,19 +143,19 @@ module ObjectListFilter =
143143
let private StringContainsMethod = typeof<string>.GetMethod ("Contains", [| typeof<string> |])
144144
let private MemberStartsWithMethod (memberType : Type) =
145145
let method = memberType.GetMethod ("StartsWith", [| memberType |])
146-
if method = null then
147-
raise (MissingMemberException "Method 'StartsWith' not found on member type")
148-
else method
146+
match method with
147+
| null -> raise (MissingMemberException "Method 'StartsWith' not found on member type")
148+
| _ -> method
149149
let private MemberEndsWithMethod (memberType : Type) =
150150
let method = memberType.GetMethod ("EndsWith", [| memberType |])
151-
if method = null then
152-
raise (MissingMemberException "Method 'EndsWith' not found on member type")
153-
else method
151+
match method with
152+
| null -> raise (MissingMemberException "Method 'EndsWith' not found on member type")
153+
| _ -> method
154154
let private MemberContainsMethod (memberType : Type) =
155155
let method = memberType.GetMethod ("Contains", [| memberType |])
156-
if method = null then
157-
raise (MissingMemberException "Method 'Contains' not found on member type")
158-
else method
156+
match method with
157+
| null -> raise (MissingMemberException "Method 'Contains' not found on member type")
158+
| _ -> method
159159
let private getEnumerableContainsMethod (memberType : Type) =
160160
match
161161
typeof<Enumerable>

‎tests/FSharp.Data.GraphQL.Tests/ObjectListFilterLinqGenerateTests.fs‎

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@ open FSharp.Data.GraphQL.Server.Middleware
1212
type ValidStringStruct =
1313
internal
1414
| ValidStringStruct of string
15-
static member op_Equality (ValidStringStruct left, ValidStringStruct right) = left = right
16-
static member op_Inequality (ValidStringStruct left, ValidStringStruct right) = left <> right
15+
static member internal op_Equality (ValidStringStruct left, ValidStringStruct right) = left = right
16+
static member internal op_Inequality (ValidStringStruct left, ValidStringStruct right) = left <> right
1717

18-
static member op_Equality (ValidStringStruct left, right) = left = right
19-
static member op_Inequality (ValidStringStruct left, right) = left <> right
20-
static member op_GreaterThan (ValidStringStruct left, right) = left > right
21-
static member op_GreaterThanOrEqual (ValidStringStruct left, right) = left >= right
22-
static member op_LessThan (ValidStringStruct left, right) = left < right
23-
static member op_LessThanOrEqual (ValidStringStruct left, right) = left <= right
18+
static member internal op_Equality (ValidStringStruct left, right) = left = right
19+
static member internal op_Inequality (ValidStringStruct left, right) = left <> right
20+
static member internal op_GreaterThan (ValidStringStruct left, right) = left > right
21+
static member internal op_GreaterThanOrEqual (ValidStringStruct left, right) = left >= right
22+
static member internal op_LessThan (ValidStringStruct left, right) = left < right
23+
static member internal op_LessThanOrEqual (ValidStringStruct left, right) = left <= right
24+
// Just for demo purposes
2425
interface IEqualityOperators<ValidStringStruct, string, bool> with
2526
static member op_Equality (ValidStringStruct left, right) = left = right
2627
static member op_Inequality (ValidStringStruct left, right) = left <> right
@@ -33,23 +34,15 @@ type ValidStringStruct =
3334
type ValidStringObject =
3435
internal
3536
| ValidStringObject of string
36-
static member op_Equality (ValidStringObject left, ValidStringObject right) = left = right
37-
static member op_Inequality (ValidStringObject left, ValidStringObject right) = left <> right
38-
39-
static member op_Equality (ValidStringObject left, right) = left = right
40-
static member op_Inequality (ValidStringObject left, right) = left <> right
41-
static member op_GreaterThan (ValidStringObject left, right) = left > right
42-
static member op_GreaterThanOrEqual (ValidStringObject left, right) = left >= right
43-
static member op_LessThan (ValidStringObject left, right) = left < right
44-
static member op_LessThanOrEqual (ValidStringObject left, right) = left <= right
45-
//interface IEqualityOperators<ValidStringObject, ValidStringObject, bool> with
46-
// static member op_Equality (ValidStringObject left, ValidStringObject right) = left = right
47-
// static member op_Inequality (ValidStringObject left, ValidStringObject right) = left <> right
48-
//interface IComparisonOperators<ValidStringObject, ValidStringObject, bool> with
49-
// static member op_GreaterThan (ValidStringObject left, ValidStringObject right) = left > right
50-
// static member op_GreaterThanOrEqual (ValidStringObject left, ValidStringObject right) = left >= right
51-
// static member op_LessThan (ValidStringObject left, ValidStringObject right) = left < right
52-
// static member op_LessThanOrEqual (ValidStringObject left, ValidStringObject right) = left <= right
37+
static member internal op_Equality (ValidStringObject left, ValidStringObject right) = left = right
38+
static member internal op_Inequality (ValidStringObject left, ValidStringObject right) = left <> right
39+
static member internal op_Equality (ValidStringObject left, right) = left = right
40+
static member internal op_Inequality (ValidStringObject left, right) = left <> right
41+
static member internal op_GreaterThan (ValidStringObject left, right) = left > right
42+
static member internal op_GreaterThanOrEqual (ValidStringObject left, right) = left >= right
43+
static member internal op_LessThan (ValidStringObject left, right) = left < right
44+
static member internal op_LessThanOrEqual (ValidStringObject left, right) = left <= right
45+
// Just for demo purposes
5346
interface IEqualityOperators<ValidStringObject, string, bool> with
5447
static member op_Equality (ValidStringObject left, right) = left = right
5548
static member op_Inequality (ValidStringObject left, right) = left <> right
@@ -63,16 +56,16 @@ type ValidStringObject =
6356
type ValidIntStruct =
6457
internal
6558
| ValidIntStruct of Int64
66-
static member op_Equality (ValidIntStruct left, ValidIntStruct right) = left = right
67-
static member op_Inequality (ValidIntStruct left, ValidIntStruct right) = left <> right
68-
static member op_GreaterThan (ValidIntStruct left, right : Int64) = left > right
59+
static member internal op_Equality (ValidIntStruct left, ValidIntStruct right) = left = right
60+
static member internal op_Inequality (ValidIntStruct left, ValidIntStruct right) = left <> right
61+
static member internal op_GreaterThan (ValidIntStruct left, right : Int64) = left > right
6962

7063
type ValidIntObject =
7164
internal
7265
| ValidIntObject of Int64
73-
static member op_Equality (ValidIntObject left, ValidIntObject right) = left = right
74-
static member op_Inequality (ValidIntObject left, ValidIntObject right) = left <> right
75-
static member op_GreaterThan (ValidIntObject left, right : Int64) = left > right
66+
static member internal op_Equality (ValidIntObject left, ValidIntObject right) = left = right
67+
static member internal op_Inequality (ValidIntObject left, ValidIntObject right) = left <> right
68+
static member internal op_GreaterThan (ValidIntObject left, right : Int64) = left > right
7669

7770
type Butafor = {
7871
ValidStringStruct : ValidStringStruct

0 commit comments

Comments
 (0)