Add is operator as a potential replacement for null operator

Author: mattbretl

__tests__/fixtures/queries/connections-filter.graphql

@@ -1,4 +1,6 @@
 query {
+  string_is_null: allFilterables(filter: { string: { is: NULL } }) { ...filterableConnection }
+  string_is_not_null: allFilterables(filter: { string: { is: NOT_NULL } }) { ...filterableConnection }
   string_null_true: allFilterables(filter: { string: { null: true } }) { ...filterableConnection }
   string_null_false: allFilterables(filter: { string: { null: false } }) { ...filterableConnection }
   string_equalTo_test: allFilterables(filter: { string: { equalTo: "test" } }) { ...filterableConnection }

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

@@ -1518,6 +1518,83 @@ Object {
       },
       "totalCount": 1,
     },
+    "string_is_not_null": Object {
+      "edges": Array [
+        Object {
+          "cursor": "WyJwcmltYXJ5X2tleV9hc2MiLFsxXV0=",
+          "node": Object {
+            "boolean": true,
+            "id": 1,
+            "int": 1,
+            "numeric": "0.1",
+            "real": 0.1,
+            "string": "TEST",
+          },
+        },
+        Object {
+          "cursor": "WyJwcmltYXJ5X2tleV9hc2MiLFsyXV0=",
+          "node": Object {
+            "boolean": true,
+            "id": 2,
+            "int": 2,
+            "numeric": "0.2",
+            "real": 0.2,
+            "string": "Test",
+          },
+        },
+        Object {
+          "cursor": "WyJwcmltYXJ5X2tleV9hc2MiLFszXV0=",
+          "node": Object {
+            "boolean": false,
+            "id": 3,
+            "int": 3,
+            "numeric": "0.3",
+            "real": 0.3,
+            "string": "tEST",
+          },
+        },
+        Object {
+          "cursor": "WyJwcmltYXJ5X2tleV9hc2MiLFs0XV0=",
+          "node": Object {
+            "boolean": false,
+            "id": 4,
+            "int": 4,
+            "numeric": "0.4",
+            "real": 0.4,
+            "string": "test",
+          },
+        },
+      ],
+      "pageInfo": Object {
+        "endCursor": "WyJwcmltYXJ5X2tleV9hc2MiLFs0XV0=",
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "startCursor": "WyJwcmltYXJ5X2tleV9hc2MiLFsxXV0=",
+      },
+      "totalCount": 4,
+    },
+    "string_is_null": Object {
+      "edges": Array [
+        Object {
+          "cursor": "WyJwcmltYXJ5X2tleV9hc2MiLFs1XV0=",
+          "node": Object {
+            "boolean": null,
+            "id": 5,
+            "int": null,
+            "numeric": null,
+            "real": null,
+            "string": null,
+          },
+        },
+      ],
+      "pageInfo": Object {
+        "endCursor": "WyJwcmltYXJ5X2tleV9hc2MiLFs1XV0=",
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "startCursor": "WyJwcmltYXJ5X2tleV9hc2MiLFs1XV0=",
+      },
+      "totalCount": 1,
+    },
     "string_likeInsensitive_es": Object {
       "edges": Array [
         Object {

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

@@ -125,6 +125,9 @@ input AnIntFilter {
   # Checks for values in this list.
   in: [AnInt!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values equal to this value, treating null like an ordinary value.
   notDistinctFrom: AnInt
 
@@ -187,6 +190,9 @@ input AnotherIntFilter {
   # Checks for values in this list.
   in: [AnotherInt!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values equal to this value, treating null like an ordinary value.
   notDistinctFrom: AnotherInt
 
@@ -282,6 +288,9 @@ input BigFloatFilter {
   # Checks for values in this list.
   in: [BigFloat!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values less than this value.
   lessThan: BigFloat
 
@@ -353,6 +362,9 @@ input BigIntFilter {
   # Checks for values in this list.
   in: [BigInt!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values equal to this value, treating null like an ordinary value.
   notDistinctFrom: BigInt
 
@@ -377,6 +389,9 @@ input BooleanFilter {
   # Checks for values in this list.
   in: [Boolean!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values equal to this value, treating null like an ordinary value.
   notDistinctFrom: Boolean
 
@@ -407,6 +422,9 @@ input ColorFilter {
   # Checks for values in this list.
   in: [Color!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values equal to this value, treating null like an ordinary value.
   notDistinctFrom: Color
 
@@ -1040,6 +1058,9 @@ input DateFilter {
   # Checks for values in this list.
   in: [Date!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values less than this value.
   lessThan: Date
 
@@ -1116,6 +1137,9 @@ input DatetimeFilter {
   # Checks for values in this list.
   in: [Datetime!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values less than this value.
   lessThan: Datetime
 
@@ -1677,6 +1701,9 @@ input EmailFilter {
   # Checks for values in this list.
   in: [Email!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values equal to this value, treating null like an ordinary value.
   notDistinctFrom: Email
 
@@ -1851,6 +1878,9 @@ input FloatFilter {
   # Checks for values in this list.
   in: [Float!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values less than this value.
   lessThan: Float
 
@@ -2060,6 +2090,9 @@ input IntFilter {
   # Checks for values in this list.
   in: [Int!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values less than this value.
   lessThan: Int
 
@@ -2191,6 +2224,9 @@ input JSONFilter {
   # Checks for values in this list.
   in: [JSON!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values equal to this value, treating null like an ordinary value.
   notDistinctFrom: JSON
 
@@ -2862,6 +2898,11 @@ type NormalRandPayload {
 
 scalar NotNullUrl
 
+enum NullOrNotNull {
+  NOT_NULL
+  NULL
+}
+
 # Information about pagination in a connection.
 type PageInfo {
   # When paginating forwards, the cursor to continue.
@@ -4214,6 +4255,9 @@ input StringFilter {
   # Checks for values in this list.
   in: [String!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values less than this value.
   lessThan: String
 
@@ -4522,6 +4566,9 @@ input TimeFilter {
   # Checks for values in this list.
   in: [Time!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values less than this value.
   lessThan: Time
 
@@ -8264,6 +8311,9 @@ input BigFloatFilter {
   # Checks for values in this list.
   in: [BigFloat!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values less than this value.
   lessThan: BigFloat
 
@@ -8294,6 +8344,9 @@ input BooleanFilter {
   # Checks for values in this list.
   in: [Boolean!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values not equal to this value.
   ne: Boolean
 
@@ -9016,6 +9069,9 @@ input FloatFilter {
   # Checks for values in this list.
   in: [Float!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values less than this value.
   lessThan: Float
 
@@ -9134,6 +9190,9 @@ input IntFilter {
   # Checks for values in this list.
   in: [Int!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values less than this value.
   lessThan: Int
 
@@ -9479,6 +9538,11 @@ type NormalRandPayload {
   query: Query
 }
 
+enum NullOrNotNull {
+  NOT_NULL
+  NULL
+}
+
 # Information about pagination in a connection.
 type PageInfo {
   # When paginating forwards, the cursor to continue.
@@ -10311,6 +10375,9 @@ input StringFilter {
   # Checks for values in this list.
   in: [String!]
 
+  # Checks for null or non-null values.
+  is: NullOrNotNull
+
   # Checks for values less than this value.
   lessThan: String
 

src/PgConnectionArgFilterOperatorsPlugin.js

@@ -4,13 +4,40 @@ module.exports = function PgConnectionArgFilterOperatorsPlugin(builder) {
     (
       _,
       {
+        newWithHooks,
         getTypeByName,
         addConnectionFilterOperator,
         escapeLikeWildcards,
         pgSql: sql,
-        graphql: { GraphQLBoolean, GraphQLList, GraphQLNonNull },
+        graphql: {
+          GraphQLBoolean,
+          GraphQLList,
+          GraphQLNonNull,
+          GraphQLEnumType,
+        },
       }
     ) => {
+      addConnectionFilterOperator(
+        "is",
+        "Checks for null or non-null values.",
+        () =>
+          getTypeByName("NullOrNotNull") ||
+          newWithHooks(
+            GraphQLEnumType,
+            {
+              name: "NullOrNotNull",
+              values: {
+                NULL: { value: "NULL" },
+                NOT_NULL: { value: "NOT NULL" },
+              },
+            },
+            {}
+          ),
+        (identifier, val, input) =>
+          sql.query`${identifier} ${
+            input === "NULL" ? sql.query`IS NULL` : sql.query`IS NOT NULL`
+          }`
+      );
       addConnectionFilterOperator(
         "null",
         "If set to true, checks for null values.  If set to false, checks for non-null values.",