Consider attribute's isNotNull flag for polymorphic types (#1875)

graphile · Nov 30, 2023 · 5450bde · 5450bde
2 parents 4f2fb57 + dc2bff7
commit 5450bde
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/.changeset/light-guests-yawn.md b/.changeset/light-guests-yawn.md
@@ -0,0 +1,5 @@
+---
+"graphile-build-pg": patch
+---
+
+Consider attribute's `isNotNull` flag for polymorphic types
diff --git a/graphile-build/graphile-build-pg/src/plugins/PgAttributesPlugin.ts b/graphile-build/graphile-build-pg/src/plugins/PgAttributesPlugin.ts
@@ -91,6 +91,7 @@ function processAttribute(
     | GraphileBuild.ContextInterfaceFields,
   attributeName: string,
   overrideName?: string,
+  isNotNull?: boolean,
 ): void {
   const { extend, inflection } = build;
 
@@ -126,7 +127,7 @@ function processAttribute(
     });
   const resolveResult = build.pgResolveOutputType(
     attribute.codec,
-    attribute.notNull || attribute.extensions?.tags?.notNull,
+    isNotNull || attribute.notNull || attribute.extensions?.tags?.notNull,
   );
   if (!resolveResult) {
     console.warn(
@@ -386,6 +387,7 @@ export const PgAttributesPlugin: GraphileConfig.Plugin = {
 
         for (const attributeName in pgCodec.attributes) {
           let overrideName: string | undefined = undefined;
+          let isNotNull: boolean | undefined = undefined;
           if (pgPolymorphism) {
             switch (pgPolymorphism.mode) {
               case "single": {
@@ -401,6 +403,7 @@ export const PgAttributesPlugin: GraphileConfig.Plugin = {
                 if (match?.rename) {
                   overrideName = match.rename;
                 }
+                isNotNull = match?.isNotNull;
 
                 break;
               }
@@ -418,7 +421,14 @@ export const PgAttributesPlugin: GraphileConfig.Plugin = {
               }
             }
           }
-          processAttribute(fields, build, context, attributeName, overrideName);
+          processAttribute(
+            fields,
+            build,
+            context,
+            attributeName,
+            overrideName,
+            isNotNull,
+          );
         }
         return fields;
       },

diff --git a/postgraphile/postgraphile/__tests__/schema/v4/polymorphic.1.graphql b/postgraphile/postgraphile/__tests__/schema/v4/polymorphic.1.graphql
@@ -7103,7 +7103,7 @@ type SingleTableTopic implements Node & SingleTableItem {
     """The method to use when ordering `SingleTableItem`."""
     orderBy: [SingleTableItemsOrderBy!] = [PRIMARY_KEY_ASC]
   ): SingleTableItemsConnection!
-  title: String
+  title: String!
   type: ItemType!
   updatedAt: Datetime!
 }

diff --git a/postgraphile/postgraphile/__tests__/schema/v4/skipNodePlugin.polymorphic.1.graphql b/postgraphile/postgraphile/__tests__/schema/v4/skipNodePlugin.polymorphic.1.graphql
@@ -6375,7 +6375,7 @@ type SingleTableTopic implements SingleTableItem {
     """The method to use when ordering `SingleTableItem`."""
     orderBy: [SingleTableItemsOrderBy!] = [PRIMARY_KEY_ASC]
   ): SingleTableItemsConnection!
-  title: String
+  title: String!
   type: ItemType!
   updatedAt: Datetime!
 }

diff --git a/postgraphile/postgraphile/__tests__/schema/v5/skipNodePlugin.polymorphic.1.graphql b/postgraphile/postgraphile/__tests__/schema/v5/skipNodePlugin.polymorphic.1.graphql
@@ -7546,7 +7546,7 @@ type SingleTableTopic implements SingleTableItem {
     """The method to use when ordering `SingleTableItem`."""
     orderBy: [SingleTableItemOrderBy!] = [PRIMARY_KEY_ASC]
   ): SingleTableItemConnection!
-  title: String
+  title: String!
   type: ItemType!
   updatedAt: Datetime!
 }