fix(typegen): allow composite type attributes to be null

arin-c · arin-c · commit aa71282c351b · 2023-09-21T11:21:34.000+12:00
diff --git a/src/server/templates/typescript.ts b/src/server/templates/typescript.ts
@@ -387,7 +387,7 @@ export interface Database {
                               type.name,
                               types,
                               schemas
-                            )}`
+                            )} | null`
                           }
                           return `${JSON.stringify(name)}: unknown`
                         })}
diff --git a/test/db/01-memes.sql b/test/db/01-memes.sql
@@ -1,8 +1,10 @@
 
+CREATE TYPE public.composite_t AS (attr int);
 
 CREATE TABLE public.category (
 	id serial NOT NULL PRIMARY KEY,
-	name text NOT NULL
+	name text NOT NULL,
+        composite composite_t
 );
 
 -- Fake policies
diff --git a/test/server/typegen.ts b/test/server/typegen.ts
@@ -19,14 +19,17 @@ test('typegen', async () => {
         Tables: {
           category: {
             Row: {
+              composite: Database["public"]["CompositeTypes"]["composite_t"] | null
               id: number
               name: string
             }
             Insert: {
+              composite?: Database["public"]["CompositeTypes"]["composite_t"] | null
               id?: number
               name: string
             }
             Update: {
+              composite?: Database["public"]["CompositeTypes"]["composite_t"] | null
               id?: number
               name?: string
             }
@@ -264,7 +267,9 @@ test('typegen', async () => {
           user_status: "ACTIVE" | "INACTIVE"
         }
         CompositeTypes: {
-          [_ in never]: never
+          composite_t: {
+            attr: number | null
+          }
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ export interface Database {`
`387`	`387`	`type.name,`
`388`	`388`	`types,`
`389`	`389`	`schemas`
`390`		- )}`
	`390`	+ )} \| null`
`391`	`391`	`}`
`392`	`392`	return `${JSON.stringify(name)}: unknown`
`393`	`393`	`})}`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,17 @@ test('typegen', async () => {`
`19`	`19`	`Tables: {`
`20`	`20`	`category: {`
`21`	`21`	`Row: {`
	`22`	`+ composite: Database["public"]["CompositeTypes"]["composite_t"] \| null`
`22`	`23`	`id: number`
`2 B3CF 3`	`24`	`name: string`
`24`	`25`	`}`
`25`	`26`	`Insert: {`
	`27`	`+ composite?: Database["public"]["CompositeTypes"]["composite_t"] \| null`
`26`	`28`	`id?: number`
`27`	`29`	`name: string`
`28`	`30`	`}`
`29`	`31`	`Update: {`
	`32`	`+ composite?: Database["public"]["CompositeTypes"]["composite_t"] \| null`
`30`	`33`	`id?: number`
`31`	`34`	`name?: string`
`32`	`35`	`}`
`@@ -264,7 +267,9 @@ test('typegen', async () => {`
`264`	`267`	`user_status: "ACTIVE" \| "INACTIVE"`
`265`	`268`	`}`
`266`	`269`	`CompositeTypes: {`
`267`		`- [_ in never]: never`
	`270`	`+ composite_t: {`
	`271`	`+ attr: number \| null`
	`272`	`+ }`
`268`	`273`	`}`
`269`	`274`	`}`
`270`	`275`	`}`