Make sure connectByIds and deleteByIds are not processed as updateByIds (mlipscombe#4)

* Make sure connectByIds and deleteByIds,  are not processed as updateByIds
* Bump version

Author: andrisak

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

@@ -1866,6 +1866,103 @@ GraphQLSchema {
 }
 `;
 
+exports[`forward nested mutation with updateById and deleteById succeeds 1`] = `
+GraphQLSchema {
+  "__validationErrors": Array [],
+  "_directives": Array [
+    "@include",
+    "@skip",
+    "@deprecated",
+    "@specifiedBy",
+  ],
+  "_implementationsMap": Object {
+    "Node": Object {
+      "interfaces": Array [],
+      "objects": Array [
+        "Query",
+        "Child",
+        "Parent",
+      ],
+    },
+  },
+  "_mutationType": "Mutation",
+  "_queryType": "Query",
+  "_subTypeMap": Object {},
+  "_subscriptionType": undefined,
+  "_typeMap": Object {
+    "Boolean": "Boolean",
+    "Child": "Child",
+    "ChildChildPkeyConnect": "ChildChildPkeyConnect",
+    "ChildChildPkeyDelete": "ChildChildPkeyDelete",
+    "ChildCondition": "ChildCondition",
+    "ChildInput": "ChildInput",
+    "ChildNodeIdConnect": "ChildNodeIdConnect",
+    "ChildNodeIdDelete": "ChildNodeIdDelete",
+    "ChildOnChildForChildParentFkeyNodeIdUpdate": "ChildOnChildForChildParentFkeyNodeIdUpdate",
+    "ChildOnChildForChildParentFkeyUsingChildPkeyUpdate": "ChildOnChildForChildParentFkeyUsingChildPkeyUpdate",
+    "ChildParentFkeyChildCreateInput": "ChildParentFkeyChildCreateInput",
+    "ChildParentFkeyInput": "ChildParentFkeyInput",
+    "ChildParentFkeyInverseInput": "ChildParentFkeyInverseInput",
+    "ChildParentFkeyParentCreateInput": "ChildParentFkeyParentCreateInput",
+    "ChildPatch": "ChildPatch",
+    "ChildrenConnection": "ChildrenConnection",
+    "ChildrenEdge": "ChildrenEdge",
+    "ChildrenOrderBy": "ChildrenOrderBy",
+    "CreateChildInput": "CreateChildInput",
+    "CreateChildPayload": "CreateChildPayload",
+    "CreateParentInput": "CreateParentInput",
+    "CreateParentPayload": "CreateParentPayload",
+    "Cursor": "Cursor",
+    "DeleteChildByIdInput": "DeleteChildByIdInput",
+    "DeleteChildInput": "DeleteChildInput",
+    "DeleteChildPayload": "DeleteChildPayload",
+    "DeleteParentByIdInput": "DeleteParentByIdInput",
+    "DeleteParentInput": "DeleteParentInput",
+    "DeleteParentPayload": "DeleteParentPayload",
+    "ID": "ID",
+    "Int": "Int",
+    "Mutation": "Mutation",
+    "Node": "Node",
+    "PageInfo": "PageInfo",
+    "Parent": "Parent",
+    "ParentCondition": "ParentCondition",
+    "ParentInput": "ParentInput",
+    "ParentNodeIdConnect": "ParentNodeIdConnect",
+    "ParentNodeIdDelete": "ParentNodeIdDelete",
+    "ParentOnChildForChildParentFkeyNodeIdUpdate": "ParentOnChildForChildParentFkeyNodeIdUpdate",
+    "ParentOnChildForChildParentFkeyUsingParentPkeyUpdate": "ParentOnChildForChildParentFkeyUsingParentPkeyUpdate",
+    "ParentParentPkeyConnect": "ParentParentPkeyConnect",
+    "ParentParentPkeyDelete": "ParentParentPkeyDelete",
+    "ParentPatch": "ParentPatch",
+    "ParentsConnection": "ParentsConnection",
+    "ParentsEdge": "ParentsEdge",
+    "ParentsOrderBy": "ParentsOrderBy",
+    "Query": "Query",
+    "String": "String",
+    "UpdateChildByIdInput": "UpdateChildByIdInput",
+    "UpdateChildInput": "UpdateChildInput",
+    "UpdateChildPayload": "UpdateChildPayload",
+    "UpdateParentByIdInput": "UpdateParentByIdInput",
+    "UpdateParentInput": "UpdateParentInput",
+    "UpdateParentPayload": "UpdateParentPayload",
+    "__Directive": "__Directive",
+    "__DirectiveLocation": "__DirectiveLocation",
+    "__EnumValue": "__EnumValue",
+    "__Field": "__Field",
+    "__InputValue": "__InputValue",
+    "__Schema": "__Schema",
+    "__Type": "__Type",
+    "__TypeKind": "__TypeKind",
+    "updateChildOnChildForChildParentFkeyPatch": "updateChildOnChildForChildParentFkeyPatch",
+    "updateParentOnChildForChildParentFkeyPatch": "updateParentOnChildForChildParentFkeyPatch",
+  },
+  "astNode": undefined,
+  "description": undefined,
+  "extensionASTNodes": undefined,
+  "extensions": undefined,
+}
+`;
+
 exports[`reverse deeply nested mutation with nested updateById 1`] = `
 GraphQLSchema {
   "__validationErrors": Array [],

__tests__/integration/update.test.js

@@ -1919,3 +1919,78 @@ test(
     },
   }),
 );
+
+test(
+  'forward nested mutation with updateById and deleteById succeeds',
+  withSchema({
+    setup: `
+      create table p.parent (
+        id serial primary key,
+        name text not null
+      );
+      create table p.child (
+        id serial primary key,
+        parent_id integer,
+        name text not null,
+        constraint child_parent_fkey foreign key (parent_id)
+          references p.parent (id)
+      );
+
+      insert into p.parent values(1, 'parent');
+      insert into p.child values(1, 1, 'child to update');
+      insert into p.child values(2, 1, 'child to delete');
+    `,
+    test: async ({ schema, pgClient }) => {
+      const newChildName = 'updated child';
+
+      const query = `
+        mutation {
+          updateParentById(
+            input: {
+              id: 1
+              parentPatch: {
+                childrenUsingId: {
+                  deleteById: {
+                    id: 2
+                  }
+                  updateById: {
+                    id: 1
+                    childPatch: {
+                      name: "${newChildName}"
+                    }
+                  }
+                }
+              }
+            }
+          ) {
+            parent {
+              id
+              name
+              childrenByParentId {
+                nodes {
+                  id
+                  parentId
+                  name
+                }
+              }
+            }
+          }
+        }
+      `;
+      expect(schema).toMatchSnapshot();
+
+      const result = await graphql(schema, query, null, { pgClient });
+      expect(result).not.toHaveProperty('errors');
+
+      const { parent } = result.data.updateParentById;
+      expect(parent.childrenByParentId.nodes).toHaveLength(1);
+      expect(parent.id).toBe(1);
+      expect(parent.name).toBe('parent');
+
+      const child = parent.childrenByParentId.nodes[0];
+      expect(child.id).toBe(1);
+      expect(child.name).toBe(newChildName);
+      expect(child.parentId).toBe(1);
+    },
+  }),
+);

src/PostgraphileNestedMutationsPlugin.js

@@ -457,6 +457,7 @@ module.exports = function PostGraphileNestedMutationPlugin(builder) {
               );
             }
 
+            // perform nested connects
             await Promise.all(
               pgNestedTableConnectorFields[foreignTable.id]
                 .filter((f) => fieldValue[f.fieldName])
@@ -494,6 +495,7 @@ module.exports = function PostGraphileNestedMutationPlugin(builder) {
                 }),
             );
 
+            // perform nested deletes
             await Promise.all(
               pgNestedTableDeleterFields[foreignTable.id]
                 .filter((f) => fieldValue[f.fieldName])
@@ -518,6 +520,7 @@ module.exports = function PostGraphileNestedMutationPlugin(builder) {
                 }),
             );
 
+            // perform nested updates
             await Promise.all(
               pgNestedTableUpdaterFields[table.id][constraint.id]
                 .filter((f) => fieldValue[f.fieldName])
@@ -653,7 +656,7 @@ module.exports = function PostGraphileNestedMutationPlugin(builder) {
 
             if (fieldValue.updateById || fieldValue.updateByNodeId) {
               await Promise.all(
-                Object.keys(fieldValue)
+                ['updateById', 'updateByNodeId']
                   .filter((f) => fieldValue[f])
                   .map(async (f) => {
                     await Promise.all(