fix(order): fix order by computed column SQL item bug (#741)

pszafer · benjie · web-flow · commit 0635ecb64f82 · 2021-05-26T14:57:08.000+01:00
Co-authored-by: Benjie Gillam &lt;benjie@jemjie.com&gt;
diff --git a/packages/graphile-build-pg/src/plugins/PgMutationPayloadEdgePlugin.js b/packages/graphile-build-pg/src/plugins/PgMutationPayloadEdgePlugin.js
@@ -171,6 +171,8 @@ export default (function PgMutationPayloadEdgePlugin(
                         ? sql.fragment`${queryBuilder.getTableAlias()}.${sql.identifier(
                             col
                           )}`
+                        : typeof col === "function"
+                        ? col({ queryBuilder })
                         : col;
                       expressions.push(expr);
                     });
diff --git a/packages/postgraphile-core/__tests__/fixtures/mutations/mutation-delete.graphql b/packages/postgraphile-core/__tests__/fixtures/mutations/mutation-delete.graphql
@@ -12,6 +12,7 @@ mutation {
   j: deleteCompoundKeyByPersonId1AndPersonId2(input: { personId1: 2, personId2:3 }) { ...deleteCompoundKeyPayload }
 	k: deletePersonByEmail(input: { email: "budd.deey@email.com" }) { ...deletePersonPayload }
 	l: deletePersonByEmail(input: { email: "graphile-build.issue.27.exists@example.com" }) { ...deletePersonPayload2 }
+  m: deletePersonById(input: { id: 1 }) { ...deletePersonPayloadWithEdge }
 }
 
 fragment deletePostPayload on DeletePostPayload {
@@ -62,3 +63,20 @@ fragment deletePersonPayload2 on DeletePersonPayload {
   }
   query { nodeId }
 }
+
+fragment deletePersonPayloadWithEdge on DeletePersonPayload {
+  clientMutationId
+  deletedPersonId
+  personEdge(orderBy: FIRST_NAME_ASC) {
+    cursor
+    node {
+      firstName
+      id
+      nodeId
+      email
+    }
+  }
+  query {
+    nodeId
+  }
+}
diff --git a/packages/postgraphile-core/__tests__/integration/__snapshots__/mutations.test.js.snap b/packages/postgraphile-core/__tests__/integration/__snapshots__/mutations.test.js.snap
@@ -893,6 +893,22 @@ Object {
         "nodeId": "query",
       },
     },
+    "m": Object {
+      "clientMutationId": null,
+      "deletedPersonId": "WyJwZW9wbGUiLDFd",
+      "personEdge": Object {
+        "cursor": "WyJmaXJzdF9uYW1lX2FzYyIsWyJKb2huIiwxXV0=",
+        "node": Object {
+          "email": "john.smith@email.com",
+          "firstName": "John",
+          "id": 1,
+          "nodeId": "WyJwZW9wbGUiLDFd",
+        },
+      },
+      "query": Object {
+        "nodeId": "query",
+      },
+    },
   },
   "errors": Array [
     [GraphQLError: No values were deleted in collection 'posts' because no values you can delete were found matching these criteria.],
diff --git a/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/defaultOptions.test.js.snap b/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/defaultOptions.test.js.snap
@@ -5751,6 +5751,8 @@ enum PeopleOrderBy {
   CREATED_AT_DESC
   EMAIL_ASC
   EMAIL_DESC
+  FIRST_NAME_ASC
+  FIRST_NAME_DESC
   ID_ASC
   ID_DESC
   LAST_LOGIN_FROM_IP_ASC
@@ -15948,6 +15950,8 @@ enum PeopleOrderBy {
   CREATED_AT_DESC
   EMAIL_ASC
   EMAIL_DESC
+  FIRST_NAME_ASC
+  FIRST_NAME_DESC
   ID_ASC
   ID_DESC
   LAST_LOGIN_FROM_IP_ASC
diff --git a/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/disabledTagsNoLegacyRelations.test.js.snap b/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/disabledTagsNoLegacyRelations.test.js.snap
@@ -2939,6 +2939,8 @@ type Person implements Node {
 
   """@deprecated This is deprecated (comment on function c.person_exists)."""
   exists(email: Email): Boolean
+
+  """@sortable"""
   firstName: String
   firstPost: Post
 
diff --git a/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/function-clash.test.js.snap b/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/function-clash.test.js.snap
@@ -5751,6 +5751,8 @@ enum PeopleOrderBy {
   CREATED_AT_DESC
   EMAIL_ASC
   EMAIL_DESC
+  FIRST_NAME_ASC
+  FIRST_NAME_DESC
   ID_ASC
   ID_DESC
   LAST_LOGIN_FROM_IP_ASC
diff --git a/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/indexes.test.js.snap b/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/indexes.test.js.snap
@@ -6086,6 +6086,8 @@ enum PeopleOrderBy {
   COMPUTED_OUT_DESC
   EMAIL_ASC
   EMAIL_DESC
+  FIRST_NAME_ASC
+  FIRST_NAME_DESC
   ID_ASC
   ID_DESC
   NATURAL
diff --git a/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/inflect-core.test.js.snap b/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/inflect-core.test.js.snap
@@ -5766,6 +5766,8 @@ enum PeopleOrderBy {
   CREATED_AT_DESC
   EMAIL_ASC
   EMAIL_DESC
+  FIRST_NAME_ASC
+  FIRST_NAME_DESC
   ID_ASC
   ID_DESC
   LAST_LOGIN_FROM_IP_ASC
diff --git a/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/legacyFunctionsOnly.test.js.snap b/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/legacyFunctionsOnly.test.js.snap
@@ -2123,6 +2123,8 @@ enum PeopleOrderBy {
   CREATED_AT_DESC
   EMAIL_ASC
   EMAIL_DESC
+  FIRST_NAME_ASC
+  FIRST_NAME_DESC
   ID_ASC
   ID_DESC
   LAST_LOGIN_FROM_IP_ASC
diff --git a/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/legacyRelationsOnlyLegacyJsonNoTags.test.js.snap b/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/legacyRelationsOnlyLegacyJsonNoTags.test.js.snap
@@ -2939,6 +2939,8 @@ type Person implements Node {
 
   """@deprecated This is deprecated (comment on function c.person_exists)."""
   exists(email: Email): Boolean
+
+  """@sortable"""
   firstName: String
   firstPost: Post
 
diff --git a/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/noDefaultMutations.test.js.snap b/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/noDefaultMutations.test.js.snap
@@ -1771,6 +1771,8 @@ enum PeopleOrderBy {
   CREATED_AT_DESC
   EMAIL_ASC
   EMAIL_DESC
+  FIRST_NAME_ASC
+  FIRST_NAME_DESC
   ID_ASC
   ID_DESC
   LAST_LOGIN_FROM_IP_ASC
diff --git a/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/rbac.test.js.snap b/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/rbac.test.js.snap
@@ -7078,6 +7078,8 @@ enum PeopleOrderBy {
   CREATED_AT_DESC
   EMAIL_ASC
   EMAIL_DESC
+  FIRST_NAME_ASC
+  FIRST_NAME_DESC
   ID_ASC
   ID_DESC
   LAST_LOGIN_FROM_IP_ASC
diff --git a/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/relay1.test.js.snap b/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/relay1.test.js.snap
@@ -2842,6 +2842,8 @@ enum PeopleOrderBy {
   CREATED_AT_DESC
   EMAIL_ASC
   EMAIL_DESC
+  FIRST_NAME_ASC
+  FIRST_NAME_DESC
   ID_ASC
   ID_DESC
   LAST_LOGIN_FROM_IP_ASC
diff --git a/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/simple-collections.test.js.snap b/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/simple-collections.test.js.snap
@@ -2846,6 +2846,8 @@ enum PeopleOrderBy {
   CREATED_AT_DESC
   EMAIL_ASC
   EMAIL_DESC
+  FIRST_NAME_ASC
+  FIRST_NAME_DESC
   ID_ASC
   ID_DESC
   LAST_LOGIN_FROM_IP_ASC
@@ -7156,6 +7158,8 @@ enum PeopleOrderBy {
   CREATED_AT_DESC
   EMAIL_ASC
   EMAIL_DESC
+  FIRST_NAME_ASC
+  FIRST_NAME_DESC
   ID_ASC
   ID_DESC
   LAST_LOGIN_FROM_IP_ASC
diff --git a/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/simplePrint.test.js.snap b/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/simplePrint.test.js.snap
@@ -2862,6 +2862,8 @@ enum PeopleOrderBy {
   CREATED_AT_DESC
   COMPUTED_OUT_ASC
   COMPUTED_OUT_DESC
+  FIRST_NAME_ASC
+  FIRST_NAME_DESC
   PRIMARY_KEY_ASC
   PRIMARY_KEY_DESC
 }
diff --git a/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/skipNodePlugin.test.js.snap b/packages/postgraphile-core/__tests__/integration/schema/__snapshots__/skipNodePlugin.test.js.snap
@@ -5147,6 +5147,8 @@ enum PeopleOrderBy {
   CREATED_AT_DESC
   EMAIL_ASC
   EMAIL_DESC
+  FIRST_NAME_ASC
+  FIRST_NAME_DESC
   ID_ASC
   ID_DESC
   LAST_LOGIN_FROM_IP_ASC
diff --git a/packages/postgraphile-core/__tests__/kitchen-sink-schema.sql b/packages/postgraphile-core/__tests__/kitchen-sink-schema.sql
@@ -369,6 +369,7 @@ create function c.no_args_mutation() returns int as $$ select 2 $$ language sql;
 create function a.return_void_mutation() returns void as $$ begin return; end; $$ language plpgsql;
 
 create function c.person_first_name(person c.person) returns text as $$ select split_part(person.person_full_name, ' ', 1) $$ language sql stable;
+comment on function c.person_first_name(c.person) is E'@sortable';
 create function c.person_friends(person c.person) returns setof c.person as $$ select friend.* from c.person as friend where friend.id in (person.id + 1, person.id + 2) $$ language sql stable;
 comment on function c.person_friends(c.person) is E'@sortable';
 create function c.person_first_post(person c.person) returns a.post as $$ select * from a.post where a.post.author_id = person.id order by id asc limit 1 $$ language sql stable;
