Skip to content

Commit 50d7f8a

Browse files
mattbretlmattbretl
committed
Rename inet operators
1 parent 15502cf commit 50d7f8a

File tree

8 files changed

+90
-91
lines changed

8 files changed

+90
-91
lines changed

‎README.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,11 @@ The following filter operators are exposed by default:
9999
| NOT SIMILAR TO '...' | notSimilarTo | String |
100100
| @> | contains | JSON |
101101
| <@ | containedBy | JSON |
102-
| &lt;&lt; | inetContainedBy | InternetAddress |
103-
| &lt;&lt;= | inetContainedByOrEquals | InternetAddress |
104-
| &gt;&gt; | inetContains | InternetAddress |
105-
| &gt;&gt;= | inetContainsOrEquals | InternetAddress |
106-
| &amp;&amp; | inetContainsOrIsContainedBy | InternetAddress |
107-
102+
| << | containedBy | InternetAddress |
103+
| <<= | containedByOrEqualTo | InternetAddress |
104+
| >> | contains | InternetAddress |
105+
| >>= | containsOrEqualTo | InternetAddress |
106+
| && | containsOrContainedBy | InternetAddress |
108107

109108
### List Comparison Operators
110109

‎__tests__/fixtures/queries/connections-filter.graphql‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ query {
6161
intArray_anyLessThanOrEqualTo_2: allFilterables(filter: { intArray: { anyLessThanOrEqualTo: 2 } }) { ...intArrayConnection }
6262
intArray_anyGreaterThan_2: allFilterables(filter: { intArray: { anyGreaterThan: 2 } }) { ...intArrayConnection }
6363
intArray_anyGreaterThanOrEqualTo_2: allFilterables(filter: { intArray: { anyGreaterThanOrEqualTo: 2 } }) { ...intArrayConnection }
64-
inet_containedBy: allFilterables(filter: { inet: { inetContainedBy: "192.168.0.0/24" } }) { ...inetConnection }
65-
inet_containedByOrEquals_ContainedBy: allFilterables(filter: { inet: { inetContainedByOrEquals: "192.168.1.0/24" } }) { ...inetConnection }
66-
inet_containedByOrEquals_Equals: allFilterables(filter: { inet: { inetContainedByOrEquals: "192.168.1.1" } }) { ...inetConnection }
67-
inet_contains: allFilterables(filter: { inet: { inetContains: "10.0.0.1" } }) { ...inetConnection }
68-
inet_containsOrEquals_Contains: allFilterables(filter: { inet: { inetContainsOrEquals: "10.0.0.2" } }) { ...inetConnection }
69-
inet_containsOrEquals_Equals: allFilterables(filter: { inet: { inetContainsOrEquals: "10.0.0.1/24" } }) { ...inetConnection }
70-
inet_containsOrIsContainedBy_Contains: allFilterables(filter: { inet: { inetContainsOrIsContainedBy: "172.168.1.0/24" } }) { ...inetConnection }
71-
inet_containsOrIsContainedBy_ContainedBy: allFilterables(filter: { inet: { inetContainsOrIsContainedBy: "10.0.0.5" } }) { ...inetConnection }
64+
inet_containedBy: allFilterables(filter: { inet: { containedBy: "192.168.0.0/24" } }) { ...inetConnection }
65+
inet_containedByOrEqualTo_ContainedBy: allFilterables(filter: { inet: { containedByOrEqualTo: "192.168.1.0/24" } }) { ...inetConnection }
66+
inet_containedByOrEqualTo_EqualTo: allFilterables(filter: { inet: { containedByOrEqualTo: "192.168.1.1" } }) { ...inetConnection }
67+
inet_contains: allFilterables(filter: { inet: { contains: "10.0.0.1" } }) { ...inetConnection }
68+
inet_containsOrEqualTo_Contains: allFilterables(filter: { inet: { containsOrEqualTo: "10.0.0.2" } }) { ...inetConnection }
69+
inet_containsOrEqualTo_EqualTo: allFilterables(filter: { inet: { containsOrEqualTo: "10.0.0.1/24" } }) { ...inetConnection }
70+
inet_containsOrContainedBy_Contains: allFilterables(filter: { inet: { containsOrContainedBy: "172.168.1.0/24" } }) { ...inetConnection }
71+
inet_containsOrContainedBy_ContainedBy: allFilterables(filter: { inet: { containsOrContainedBy: "10.0.0.5" } }) { ...inetConnection }
7272
enum_equalTo_OK: allFilterables(filter: { enum: { equalTo: OK } }) { ...enumConnection }
7373
allFilterables_computedSetofChild_name_equalTo_child2: allFilterables { nodes { id, computedSetofChild(filter: { name: { equalTo: "child2" } }) { ...childConnection } } }
7474
filterableById_1_computedSetofChild_name_equalTo_child2: filterableById(id: 1) { id, computedSetofChild(filter: { name: { equalTo: "child2" } }) { ...childConnection } }

‎__tests__/integration/__snapshots__/queries.test.js.snap‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -208,15 +208,15 @@ Object {
208208
},
209209
],
210210
},
211-
"inet_containedByOrEquals_ContainedBy": Object {
211+
"inet_containedByOrEqualTo_ContainedBy": Object {
212212
"nodes": Array [
213213
Object {
214214
"id": 2,
215215
"inet": "192.168.1.1",
216216
},
217217
],
218218
},
219-
"inet_containedByOrEquals_Equals": Object {
219+
"inet_containedByOrEqualTo_EqualTo": Object {
220220
"nodes": Array [
221221
Object {
222222
"id": 2,
@@ -232,35 +232,35 @@ Object {
232232
},
233233
],
234234
},
235-
"inet_containsOrEquals_Contains": Object {
235+
"inet_containsOrContainedBy_ContainedBy": Object {
236236
"nodes": Array [
237237
Object {
238238
"id": 3,
239239
"inet": "10.0.0.0/24",
240240
},
241241
],
242242
},
243-
"inet_containsOrEquals_Equals": Object {
243+
"inet_containsOrContainedBy_Contains": Object {
244244
"nodes": Array [
245245
Object {
246-
"id": 3,
247-
"inet": "10.0.0.0/24",
246+
"id": 4,
247+
"inet": "172.168.1.1",
248248
},
249249
],
250250
},
251-
"inet_containsOrIsContainedBy_ContainedBy": Object {
251+
"inet_containsOrEqualTo_Contains": Object {
252252
"nodes": Array [
253253
Object {
254254
"id": 3,
255255
"inet": "10.0.0.0/24",
256256
},
257257
],
258258
},
259-
"inet_containsOrIsContainedBy_Contains": Object {
259+
"inet_containsOrEqualTo_EqualTo": Object {
260260
"nodes": Array [
261261
Object {
262-
"id": 4,
263-
"inet": "172.168.1.1",
262+
"id": 3,
263+
"inet": "10.0.0.0/24",
264264
},
265265
],
266266
},

‎__tests__/integration/schema/__snapshots__/connectionFilter.test.js.snap‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,21 @@ scalar InternetAddress
812812
A filter to be used against InternetAddress fields. All fields are combined with a logical ‘and.’
813813
\\"\\"\\"
814814
input InternetAddressFilter {
815+
\\"\\"\\"Contained by the specified internet address.\\"\\"\\"
816+
containedBy: InternetAddress
817+
818+
\\"\\"\\"Contained by or equal to the specified internet address.\\"\\"\\"
819+
containedByOrEqualTo: InternetAddress
820+
821+
\\"\\"\\"Contains the specified internet address.\\"\\"\\"
822+
contains: InternetAddress
823+
824+
\\"\\"\\"Contains or contained by the specified internet address.\\"\\"\\"
825+
containsOrContainedBy: InternetAddress
826+
827+
\\"\\"\\"Contains or equal to the specified internet address.\\"\\"\\"
828+
containsOrEqualTo: InternetAddress
829+
815830
\\"\\"\\"
816831
Not equal to the specified value, treating null like an ordinary value.
817832
\\"\\"\\"
@@ -823,21 +838,6 @@ input InternetAddressFilter {
823838
\\"\\"\\"Included in the specified list.\\"\\"\\"
824839
in: [InternetAddress!]
825840
826-
\\"\\"\\"Contained by the specified internet address.\\"\\"\\"
827-
inetContainedBy: InternetAddress
828-
829-
\\"\\"\\"Contained by or equal to the specified internet address.\\"\\"\\"
830-
inetContainedByOrEquals: InternetAddress
831-
832-
\\"\\"\\"Contains the specified internet address.\\"\\"\\"
833-
inetContains: InternetAddress
834-
835-
\\"\\"\\"Contains or is equal to the specified internet address.\\"\\"\\"
836-
inetContainsOrEquals: InternetAddress
837-
838-
\\"\\"\\"Contains or is contained by the specified internet address.\\"\\"\\"
839-
inetContainsOrIsContainedBy: InternetAddress
840-
841841
\\"\\"\\"
842842
Is null (if \`true\` is specified) or is not null (if \`false\` is specified).
843843
\\"\\"\\"

‎__tests__/integration/schema/__snapshots__/connectionFilterListsFalse.test.js.snap‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -806,6 +806,21 @@ scalar InternetAddress
806806
A filter to be used against InternetAddress fields. All fields are combined with a logical ‘and.’
807807
\\"\\"\\"
808808
input InternetAddressFilter {
809+
\\"\\"\\"Contained by the specified internet address.\\"\\"\\"
810+
containedBy: InternetAddress
811+
812+
\\"\\"\\"Contained by or equal to the specified internet address.\\"\\"\\"
813+
containedByOrEqualTo: InternetAddress
814+
815+
\\"\\"\\"Contains the specified internet address.\\"\\"\\"
816+
contains: InternetAddress
817+
818+
\\"\\"\\"Contains or contained by the specified internet address.\\"\\"\\"
819+
containsOrContainedBy: InternetAddress
820+
821+
\\"\\"\\"Contains or equal to the specified internet address.\\"\\"\\"
822+
containsOrEqualTo: InternetAddress
823+
809824
\\"\\"\\"
810825
Not equal to the specified value, treating null like an ordinary value.
811826
\\"\\"\\"
@@ -817,21 +832,6 @@ input InternetAddressFilter {
817832
\\"\\"\\"Included in the specified list.\\"\\"\\"
818833
in: [InternetAddress!]
819834
820-
\\"\\"\\"Contained by the specified internet address.\\"\\"\\"
821-
inetContainedBy: InternetAddress
822-
823-
\\"\\"\\"Contained by or equal to the specified internet address.\\"\\"\\"
824-
inetContainedByOrEquals: InternetAddress
825-
826-
\\"\\"\\"Contains the specified internet address.\\"\\"\\"
827-
inetContains: InternetAddress
828-
829-
\\"\\"\\"Contains or is equal to the specified internet address.\\"\\"\\"
830-
inetContainsOrEquals: InternetAddress
831-
832-
\\"\\"\\"Contains or is contained by the specified internet address.\\"\\"\\"
833-
inetContainsOrIsContainedBy: InternetAddress
834-
835835
\\"\\"\\"
836836
Is null (if \`true\` is specified) or is not null (if \`false\` is specified).
837837
\\"\\"\\"

‎__tests__/integration/schema/__snapshots__/connectionFilterOperatorNames.test.js.snap‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,21 @@ scalar InternetAddress
812812
A filter to be used against InternetAddress fields. All fields are combined with a logical ‘and.’
813813
\\"\\"\\"
814814
input InternetAddressFilter {
815+
\\"\\"\\"Contained by the specified internet address.\\"\\"\\"
816+
containedBy: InternetAddress
817+
818+
\\"\\"\\"Contained by or equal to the specified internet address.\\"\\"\\"
819+
containedByOrEqualTo: InternetAddress
820+
821+
\\"\\"\\"Contains the specified internet address.\\"\\"\\"
822+
contains: InternetAddress
823+
824+
\\"\\"\\"Contains or contained by the specified internet address.\\"\\"\\"
825+
containsOrContainedBy: InternetAddress
826+
827+
\\"\\"\\"Contains or equal to the specified internet address.\\"\\"\\"
828+
containsOrEqualTo: InternetAddress
829+
815830
\\"\\"\\"
816831
Not equal to the specified value, treating null like an ordinary value.
817832
\\"\\"\\"
@@ -823,21 +838,6 @@ input InternetAddressFilter {
823838
\\"\\"\\"Included in the specified list.\\"\\"\\"
824839
in: [InternetAddress!]
825840
826-
\\"\\"\\"Contained by the specified internet address.\\"\\"\\"
827-
inetContainedBy: InternetAddress
828-
829-
\\"\\"\\"Contained by or equal to the specified internet address.\\"\\"\\"
830-
inetContainedByOrEquals: InternetAddress
831-
832-
\\"\\"\\"Contains the specified internet address.\\"\\"\\"
833-
inetContains: InternetAddress
834-
835-
\\"\\"\\"Contains or is equal to the specified internet address.\\"\\"\\"
836-
inetContainsOrEquals: InternetAddress
837-
838-
\\"\\"\\"Contains or is contained by the specified internet address.\\"\\"\\"
839-
inetContainsOrIsContainedBy: InternetAddress
840-
841841
\\"\\"\\"
842842
Is null (if \`true\` is specified) or is not null (if \`false\` is specified).
843843
\\"\\"\\"

‎__tests__/integration/schema/__snapshots__/connectionFilterRelationsTrue.test.js.snap‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,21 @@ scalar InternetAddress
845845
A filter to be used against InternetAddress fields. All fields are combined with a logical ‘and.’
846846
\\"\\"\\"
847847
input InternetAddressFilter {
848+
\\"\\"\\"Contained by the specified internet address.\\"\\"\\"
849+
containedBy: InternetAddress
850+
851+
\\"\\"\\"Contained by or equal to the specified internet address.\\"\\"\\"
852+
containedByOrEqualTo: InternetAddress
853+
854+
\\"\\"\\"Contains the specified internet address.\\"\\"\\"
855+
contains: InternetAddress
856+
857+
\\"\\"\\"Contains or contained by the specified internet address.\\"\\"\\"
858+
containsOrContainedBy: InternetAddress
859+
860+
\\"\\"\\"Contains or equal to the specified internet address.\\"\\"\\"
861+
containsOrEqualTo: InternetAddress
862+
848863
\\"\\"\\"
849864
Not equal to the specified value, treating null like an ordinary value.
850865
\\"\\"\\"
@@ -856,21 +871,6 @@ input InternetAddressFilter {
856871
\\"\\"\\"Included in the specified list.\\"\\"\\"
857872
in: [InternetAddress!]
858873
859-
\\"\\"\\"Contained by the specified internet address.\\"\\"\\"
860-
inetContainedBy: InternetAddress
861-
862-
\\"\\"\\"Contained by or equal to the specified internet address.\\"\\"\\"
863-
inetContainedByOrEquals: InternetAddress
864-
865-
\\"\\"\\"Contains the specified internet address.\\"\\"\\"
866-
inetContains: InternetAddress
867-
868-
\\"\\"\\"Contains or is equal to the specified internet address.\\"\\"\\"
869-
inetContainsOrEquals: InternetAddress
870-
871-
\\"\\"\\"Contains or is contained by the specified internet address.\\"\\"\\"
872-
inetContainsOrIsContainedBy: InternetAddress
873-
874874
\\"\\"\\"
875875
Is null (if \`true\` is specified) or is not null (if \`false\` is specified).
876876
\\"\\"\\"

‎src/PgConnectionArgFilterOperatorsPlugin.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ module.exports = function PgConnectionArgFilterOperatorsPlugin(builder) {
430430
}
431431
);
432432
addConnectionFilterOperator(
433-
"inetContainedBy",
433+
"containedBy",
434434
"Contained by the specified internet address.",
435435
fieldType => fieldType,
436436
(identifier, value) => sql.query`${identifier} << ${value}`,
@@ -439,7 +439,7 @@ module.exports = function PgConnectionArgFilterOperatorsPlugin(builder) {
439439
}
440440
);
441441
addConnectionFilterOperator(
442-
"inetContainedByOrEquals",
442+
"containedByOrEqualTo",
443443
"Contained by or equal to the specified internet address.",
444444
fieldType => fieldType,
445445
(identifier, value) => sql.query`${identifier} <<= ${value}`,
@@ -448,7 +448,7 @@ module.exports = function PgConnectionArgFilterOperatorsPlugin(builder) {
448448
}
449449
);
450450
addConnectionFilterOperator(
451-
"inetContains",
451+
"contains",
452452
"Contains the specified internet address.",
453453
fieldType => fieldType,
454454
(identifier, value) => sql.query`${identifier} >> ${value}`,
@@ -457,17 +457,17 @@ module.exports = function PgConnectionArgFilterOperatorsPlugin(builder) {
457457
}
458458
);
459459
addConnectionFilterOperator(
460-
"inetContainsOrEquals",
461-
"Contains or is equal to the specified internet address.",
460+
"containsOrEqualTo",
461+
"Contains or equal to the specified internet address.",
462462
fieldType => fieldType,
463463
(identifier, value) => sql.query`${identifier} >>= ${value}`,
464464
{
465465
allowedFieldTypes: ["InternetAddress"],
466466
}
467467
);
468468
addConnectionFilterOperator(
469-
"inetContainsOrIsContainedBy",
470-
"Contains or is contained by the specified internet address.",
469+
"containsOrContainedBy",
470+
"Contains or contained by the specified internet address.",
471471
fieldType => fieldType,
472472
(identifier, value) => sql.query`${identifier} && ${value}`,
473473
{

0 commit comments

Comments
 (0)