fix(domains): input field nullable if domain has default (#401)

graphile · Feb 24, 2019 · dd2ca61 · dd2ca61
1 parent b29ff05
commit dd2ca61
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 13 deletions.
diff --git a/packages/graphile-build-pg/src/plugins/PgColumnsPlugin.js b/packages/graphile-build-pg/src/plugins/PgColumnsPlugin.js
@@ -236,7 +236,8 @@ export default (function PgColumnsPlugin(builder) {
                     isPgBaseInput ||
                       isPgPatch ||
                       (!attr.isNotNull &&
-                        !attr.type.domainIsNotNull &&
+                        (!attr.type.domainIsNotNull ||
+                          attr.type.domainHasDefault) &&
                         !attr.tags.notNull) ||
                       attr.hasDefault ||
                       attr.identity === "d",

diff --git a/packages/graphile-build-pg/src/plugins/introspectionQuery.js b/packages/graphile-build-pg/src/plugins/introspectionQuery.js
@@ -245,6 +245,7 @@ with
         nullif(typ.typrelid, 0) as "classId",
         nullif(typ.typbasetype, 0) as "domainBaseTypeId",
         nullif(typ.typtypmod, -1) as "domainTypeModifier",
+        typ.typdefaultbin is not null as "domainHasDefault",
         -- If this type is an enum type, let’s select all of its enum variants.
         --
         -- @see https://www.postgresql.org/docs/9.5/static/catalog-pg-enum.html

diff --git a/.../postgraphile-core/__tests__/integration/schema/__snapshots__/defaultOptions.test.js.snap b/.../postgraphile-core/__tests__/integration/schema/__snapshots__/defaultOptions.test.js.snap
@@ -3003,7 +3003,7 @@ input Issue756Condition {
 \\"\\"\\"An input for mutations affecting \`Issue756\`\\"\\"\\"
 input Issue756Input {
   id: Int
-  ts: NotNullTimestamp!
+  ts: NotNullTimestamp
 }
 
 \\"\\"\\"All input for the \`issue756Mutation\` mutation.\\"\\"\\"
@@ -12478,7 +12478,7 @@ input Issue756Condition {
 \\"\\"\\"An input for mutations affecting \`Issue756\`\\"\\"\\"
 input Issue756Input {
   id: Int
-  ts: NotNullTimestamp!
+  ts: NotNullTimestamp
 }
 
 \\"\\"\\"All input for the \`issue756Mutation\` mutation.\\"\\"\\"

diff --git a/...ore/__tests__/integration/schema/__snapshots__/disabledTagsNoLegacyRelations.test.js.snap b/...ore/__tests__/integration/schema/__snapshots__/disabledTagsNoLegacyRelations.test.js.snap
@@ -1111,7 +1111,7 @@ input Issue756Condition {
 \\"\\"\\"An input for mutations affecting \`Issue756\`\\"\\"\\"
 input Issue756Input {
   id: Int
-  ts: NotNullTimestamp!
+  ts: NotNullTimestamp
 }
 
 \\"\\"\\"All input for the \`issue756Mutation\` mutation.\\"\\"\\"

diff --git a/.../postgraphile-core/__tests__/integration/schema/__snapshots__/function-clash.test.js.snap b/.../postgraphile-core/__tests__/integration/schema/__snapshots__/function-clash.test.js.snap
@@ -3003,7 +3003,7 @@ input Issue756Condition {
 \\"\\"\\"An input for mutations affecting \`Issue756\`\\"\\"\\"
 input Issue756Input {
   id: Int
-  ts: NotNullTimestamp!
+  ts: NotNullTimestamp
 }
 
 \\"\\"\\"All input for the \`issue756Mutation\` mutation.\\"\\"\\"

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
@@ -3394,7 +3394,7 @@ input Issue756Condition {
 \\"\\"\\"An input for mutations affecting \`Issue756\`\\"\\"\\"
 input Issue756Input {
   id: Int
-  ts: NotNullTimestamp!
+  ts: NotNullTimestamp
 }
 
 \\"\\"\\"All input for the \`issue756Mutation\` mutation.\\"\\"\\"

diff --git a/...es/postgraphile-core/__tests__/integration/schema/__snapshots__/inflect-core.test.js.snap b/...es/postgraphile-core/__tests__/integration/schema/__snapshots__/inflect-core.test.js.snap
@@ -3008,7 +3008,7 @@ input Issue756Condition {
 \\"\\"\\"An input for mutations affecting \`Issue756\`\\"\\"\\"
 input Issue756Input {
   id: Int
-  ts: NotNullTimestamp!
+  ts: NotNullTimestamp
 }
 
 \\"\\"\\"All input for the \`issue756Mutation\` mutation.\\"\\"\\"

diff --git a/...graphile-core/__tests__/integration/schema/__snapshots__/legacyFunctionsOnly.test.js.snap b/...graphile-core/__tests__/integration/schema/__snapshots__/legacyFunctionsOnly.test.js.snap
@@ -960,7 +960,7 @@ input Issue756Condition {
 \\"\\"\\"An input for mutations affecting \`Issue756\`\\"\\"\\"
 input Issue756Input {
   id: Int
-  ts: NotNullTimestamp!
+  ts: NotNullTimestamp
 }
 
 \\"\\"\\"All input for the \`issue756Mutation\` mutation.\\"\\"\\"

diff --git a/...tests__/integration/schema/__snapshots__/legacyRelationsOnlyLegacyJsonNoTags.test.js.snap b/...tests__/integration/schema/__snapshots__/legacyRelationsOnlyLegacyJsonNoTags.test.js.snap
@@ -1111,7 +1111,7 @@ input Issue756Condition {
 \\"\\"\\"An input for mutations affecting \`Issue756\`\\"\\"\\"
 input Issue756Input {
   id: Int
-  ts: NotNullTimestamp!
+  ts: NotNullTimestamp
 }
 
 \\"\\"\\"All input for the \`issue756Mutation\` mutation.\\"\\"\\"

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
@@ -4318,7 +4318,7 @@ input Issue756Condition {
 \\"\\"\\"An input for mutations affecting \`Issue756\`\\"\\"\\"
 input Issue756Input {
   id: Int
-  ts: NotNullTimestamp!
+  ts: NotNullTimestamp
 }
 
 \\"\\"\\"All input for the \`issue756Mutation\` mutation.\\"\\"\\"

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
@@ -1110,7 +1110,7 @@ input Issue756Condition {
 \\"\\"\\"An input for mutations affecting \`Issue756\`\\"\\"\\"
 input Issue756Input {
   rowId: Int
-  ts: NotNullTimestamp!
+  ts: NotNullTimestamp
 }
 
 \\"\\"\\"All input for the \`issue756Mutation\` mutation.\\"\\"\\"

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
@@ -1111,7 +1111,7 @@ input Issue756Condition {
 \\"\\"\\"An input for mutations affecting \`Issue756\`\\"\\"\\"
 input Issue756Input {
   id: Int
-  ts: NotNullTimestamp!
+  ts: NotNullTimestamp
 }
 
 \\"\\"\\"All input for the \`issue756Mutation\` mutation.\\"\\"\\"

diff --git a/.../postgraphile-core/__tests__/integration/schema/__snapshots__/skipNodePlugin.test.js.snap b/.../postgraphile-core/__tests__/integration/schema/__snapshots__/skipNodePlugin.test.js.snap
@@ -2745,7 +2745,7 @@ input Issue756Condition {
 \\"\\"\\"An input for mutations affecting \`Issue756\`\\"\\"\\"
 input Issue756Input {
   id: Int
-  ts: NotNullTimestamp!
+  ts: NotNullTimestamp
 }
 
 \\"\\"\\"All input for the \`issue756Mutation\` mutation.\\"\\"\\"