Merge branch 'master' into fix-types

graphile · Nov 28, 2018 · 20564fb · 20564fb
2 parents d1d7d1b + 7d49f8e
commit 20564fb
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 29 deletions.
diff --git a/packages/graphile-build-pg/src/plugins/PgScalarFunctionConnectionPlugin.js b/packages/graphile-build-pg/src/plugins/PgScalarFunctionConnectionPlugin.js
@@ -3,10 +3,7 @@ import type { Plugin } from "graphile-build";
 
 const base64 = str => Buffer.from(String(str)).toString("base64");
 
-export default (function PgScalarFunctionConnectionPlugin(
-  builder,
-  { pgForbidSetofFunctionsToReturnNull = false }
-) {
+export default (function PgScalarFunctionConnectionPlugin(builder) {
   builder.hook("init", (_, build) => {
     const {
       newWithHooks,
@@ -26,8 +23,6 @@ export default (function PgScalarFunctionConnectionPlugin(
       pgField,
     } = build;
 
-    const nullableIf = (condition, Type) =>
-      condition ? Type : new GraphQLNonNull(Type);
     const Cursor = getTypeByName("Cursor");
     introspectionResultsByKind.procedure.forEach(proc => {
       // PERFORMANCE: These used to be .filter(...) calls
@@ -111,11 +106,7 @@ export default (function PgScalarFunctionConnectionPlugin(
             return {
               nodes: pgField(build, fieldWithHooks, "nodes", {
                 description: `A list of \`${NodeType.name}\` objects.`,
-                type: new GraphQLNonNull(
-                  new GraphQLList(
-                    nullableIf(!pgForbidSetofFunctionsToReturnNull, NodeType)
-                  )
-                ),
+                type: new GraphQLNonNull(new GraphQLList(NodeType)),
                 resolve(data) {
                   return data.data.map(entry => entry.value);
                 },

diff --git a/...ore/__tests__/integration/schema/__snapshots__/disabledTagsNoLegacyRelations.test.js.snap b/...ore/__tests__/integration/schema/__snapshots__/disabledTagsNoLegacyRelations.test.js.snap
@@ -944,7 +944,7 @@ type FuncOutSetofConnection {
   edges: [FuncOutSetofEdge!]!
 
   \\"\\"\\"A list of \`Int\` objects.\\"\\"\\"
-  nodes: [Int!]!
+  nodes: [Int]!
 }
 
 \\"\\"\\"A \`Int\` edge in the connection.\\"\\"\\"
@@ -997,7 +997,7 @@ type FuncReturnsTableOneColConnection {
   edges: [FuncReturnsTableOneColEdge!]!
 
   \\"\\"\\"A list of \`Int\` objects.\\"\\"\\"
-  nodes: [Int!]!
+  nodes: [Int]!
 }
 
 \\"\\"\\"A \`Int\` edge in the connection.\\"\\"\\"
@@ -1074,7 +1074,7 @@ type IntSetQueryConnection {
   edges: [IntSetQueryEdge!]!
 
   \\"\\"\\"A list of \`Int\` objects.\\"\\"\\"
-  nodes: [Int!]!
+  nodes: [Int]!
 }
 
 \\"\\"\\"A \`Int\` edge in the connection.\\"\\"\\"

diff --git a/...tests__/integration/schema/__snapshots__/legacyRelationsOnlyLegacyJsonNoTags.test.js.snap b/...tests__/integration/schema/__snapshots__/legacyRelationsOnlyLegacyJsonNoTags.test.js.snap
@@ -944,7 +944,7 @@ type FuncOutSetofConnection {
   edges: [FuncOutSetofEdge!]!
 
   \\"\\"\\"A list of \`Int\` objects.\\"\\"\\"
-  nodes: [Int!]!
+  nodes: [Int]!
 }
 
 \\"\\"\\"A \`Int\` edge in the connection.\\"\\"\\"
@@ -997,7 +997,7 @@ type FuncReturnsTableOneColConnection {
   edges: [FuncReturnsTableOneColEdge!]!
 
   \\"\\"\\"A list of \`Int\` objects.\\"\\"\\"
-  nodes: [Int!]!
+  nodes: [Int]!
 }
 
 \\"\\"\\"A \`Int\` edge in the connection.\\"\\"\\"
@@ -1074,7 +1074,7 @@ type IntSetQueryConnection {
   edges: [IntSetQueryEdge!]!
 
   \\"\\"\\"A list of \`Int\` objects.\\"\\"\\"
-  nodes: [Int!]!
+  nodes: [Int]!
 }
 
 \\"\\"\\"A \`Int\` edge in the connection.\\"\\"\\"

diff --git a/...tgraphile-core/__tests__/integration/schema/__snapshots__/noDefaultMutations.test.js.snap b/...tgraphile-core/__tests__/integration/schema/__snapshots__/noDefaultMutations.test.js.snap
@@ -339,7 +339,7 @@ type FuncOutSetofConnection {
   edges: [FuncOutSetofEdge!]!
 
   \\"\\"\\"A list of \`Int\` objects.\\"\\"\\"
-  nodes: [Int!]!
+  nodes: [Int]!
 }
 
 \\"\\"\\"A \`Int\` edge in the connection.\\"\\"\\"
@@ -392,7 +392,7 @@ type FuncReturnsTableOneColConnection {
   edges: [FuncReturnsTableOneColEdge!]!
 
   \\"\\"\\"A list of \`Int\` objects.\\"\\"\\"
-  nodes: [Int!]!
+  nodes: [Int]!
 }
 
 \\"\\"\\"A \`Int\` edge in the connection.\\"\\"\\"
@@ -469,7 +469,7 @@ type IntSetQueryConnection {
   edges: [IntSetQueryEdge!]!
 
   \\"\\"\\"A list of \`Int\` objects.\\"\\"\\"
-  nodes: [Int!]!
+  nodes: [Int]!
 }
 
 \\"\\"\\"A \`Int\` edge in the connection.\\"\\"\\"

diff --git a/.../postgraphile-core/__tests__/integration/schema/__snapshots__/pgColumnFilter.test.js.snap b/.../postgraphile-core/__tests__/integration/schema/__snapshots__/pgColumnFilter.test.js.snap
@@ -2341,7 +2341,7 @@ type PostComputedIntervalSetConnection {
   edges: [PostComputedIntervalSetEdge!]!
 
   \\"\\"\\"A list of \`Interval\` objects.\\"\\"\\"
-  nodes: [Interval!]!
+  nodes: [Interval]!
 }
 
 \\"\\"\\"A \`Interval\` edge in the connection.\\"\\"\\"
@@ -3075,7 +3075,7 @@ type QueryIntervalSetConnection {
   edges: [QueryIntervalSetEdge!]!
 
   \\"\\"\\"A list of \`Interval\` objects.\\"\\"\\"
-  nodes: [Interval!]!
+  nodes: [Interval]!
 }
 
 \\"\\"\\"A \`Interval\` edge in the connection.\\"\\"\\"
@@ -3501,7 +3501,7 @@ type StaticBigIntegerConnection {
   edges: [StaticBigIntegerEdge!]!
 
   \\"\\"\\"A list of \`BigInt\` objects.\\"\\"\\"
-  nodes: [BigInt!]!
+  nodes: [BigInt]!
 }
 
 \\"\\"\\"A \`BigInt\` edge in the connection.\\"\\"\\"

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
@@ -944,7 +944,7 @@ type FuncOutSetofConnection {
   edges: [FuncOutSetofEdge!]!
 
   \\"\\"\\"A list of \`Int\` objects.\\"\\"\\"
-  nodes: [Int!]!
+  nodes: [Int]!
 }
 
 \\"\\"\\"A \`Int\` edge in the connection.\\"\\"\\"
@@ -997,7 +997,7 @@ type FuncReturnsTableOneColConnection {
   edges: [FuncReturnsTableOneColEdge!]!
 
   \\"\\"\\"A list of \`Int\` objects.\\"\\"\\"
-  nodes: [Int!]!
+  nodes: [Int]!
 }
 
 \\"\\"\\"A \`Int\` edge in the connection.\\"\\"\\"
@@ -1074,7 +1074,7 @@ type IntSetQueryConnection {
   edges: [IntSetQueryEdge!]!
 
   \\"\\"\\"A list of \`Int\` objects.\\"\\"\\"
-  nodes: [Int!]!
+  nodes: [Int]!
 }
 
 \\"\\"\\"A \`Int\` edge in the connection.\\"\\"\\"

diff --git a/...tgraphile-core/__tests__/integration/schema/__snapshots__/simple-collections.test.js.snap b/...tgraphile-core/__tests__/integration/schema/__snapshots__/simple-collections.test.js.snap
@@ -944,7 +944,7 @@ type FuncOutSetofConnection {
   edges: [FuncOutSetofEdge!]!
 
   \\"\\"\\"A list of \`Int\` objects.\\"\\"\\"
-  nodes: [Int!]!
+  nodes: [Int]!
 }
 
 \\"\\"\\"A \`Int\` edge in the connection.\\"\\"\\"
@@ -997,7 +997,7 @@ type FuncReturnsTableOneColConnection {
   edges: [FuncReturnsTableOneColEdge!]!
 
   \\"\\"\\"A list of \`Int\` objects.\\"\\"\\"
-  nodes: [Int!]!
+  nodes: [Int]!
 }
 
 \\"\\"\\"A \`Int\` edge in the connection.\\"\\"\\"
@@ -1074,7 +1074,7 @@ type IntSetQueryConnection {
   edges: [IntSetQueryEdge!]!
 
   \\"\\"\\"A list of \`Int\` objects.\\"\\"\\"
-  nodes: [Int!]!
+  nodes: [Int]!
 }
 
 \\"\\"\\"A \`Int\` edge in the connection.\\"\\"\\"