fix: rpc with empty args returning setof tables

Author: avallete

src/lib/sql/functions.sql

@@ -45,8 +45,13 @@ select
   nullif(rt.typrelid::int8, 0) as return_type_relation_id,
   f.proretset as is_set_returning_function,
   case
-    when f.proretset and rt.typrelid != 0 then true
-    else false
+    when f.proretset and rt.typrelid != 0 and exists (
+      select 1 from pg_class c 
+      where c.oid = rt.typrelid 
+      -- exclude custom types relation from what is considered a set of table
+      and c.relkind in ('r', 'p', 'v', 'm', 'f')
+    ) then true
+  else false
   end as returns_set_of_table,
   case 
     when f.proretset and rt.typrelid != 0 then

src/server/templates/typescript.ts

@@ -354,21 +354,21 @@ export type Database = {
                       })()}${fns[0].is_set_returning_function && fns[0].returns_multiple_rows ? '[]' : ''}
                       ${
                         // if the function return a set of a table and some definition take in parameter another table
-                        fns[0].returns_set_of_table &&
-                        fns.some((fnd) => fnd.args.length === 1 && fnd.args[0].table_name)
+                        fns[0].returns_set_of_table
                           ? `SetofOptions: {
                         from: ${fns
-                          // if the function take a row as first parameter
-                          .filter(
-                            (fnd) =>
-                              fnd.args.length === 1 &&
-                              fnd.args[0].table_name &&
-                              typesById[fnd.args[0].type_id]
-                          )
                           .map((fnd) => {
-                            const tableType = typesById[fnd.args[0].type_id]
-                            return JSON.stringify(tableType.format)
+                            if (fnd.args.length > 0 && fnd.args[0].table_name) {
+                              const tableType = typesById[fnd.args[0].type_id]
+                              return JSON.stringify(tableType.format)
+                            } else {
+                              // If the function can be called with scalars or without any arguments, then add a * matching everything
+                              return '"*"'
+                            }
                           })
+                          // Dedup before join
+                          .filter((value, index, self) => self.indexOf(value) === index)
+                          .toSorted()
                           .join(' | ')}
                         to: ${JSON.stringify(fns[0].return_table_name)}
                         isOneToOne: ${fns[0].returns_multiple_rows ? false : true}

test/server/typegen.ts

@@ -458,6 +458,11 @@ test('typegen: typescript', async () => {
               name: string | null
               status: Database["public"]["Enums"]["user_status"] | null
             }[]
+            SetofOptions: {
+              from: "*"
+              to: "users"
+              isOneToOne: false
+            }
           }
           function_returning_table: {
             Args: Record<PropertyKey, never>
@@ -483,7 +488,7 @@ test('typegen: typescript', async () => {
               user_status: Database["public"]["Enums"]["user_status"] | null
             }
             SetofOptions: {
-              from: "users" | "users_view"
+              from: "*" | "users" | "users_view"
               to: "user_todos_summary_view"
               isOneToOne: true
             }
@@ -499,7 +504,7 @@ test('typegen: typescript', async () => {
               "user-id": number
             }[]
             SetofOptions: {
-              from: "users" | "users_view"
+              from: "*" | "users" | "users_view"
               to: "todos"
               isOneToOne: false
             }
@@ -514,7 +519,7 @@ test('typegen: typescript', async () => {
               "user-id": number
             }[]
             SetofOptions: {
-              from: "users" | "todos"
+              from: "todos" | "users"
               to: "todos"
               isOneToOne: false
             }
@@ -1185,6 +1190,11 @@ test('typegen w/ one-to-one relationships', async () => {
               name: string | null
               status: Database["public"]["Enums"]["user_status"] | null
             }[]
+            SetofOptions: {
+              from: "*"
+              to: "users"
+              isOneToOne: false
+            }
           }
           function_returning_table: {
             Args: Record<PropertyKey, never>
@@ -1210,7 +1220,7 @@ test('typegen w/ one-to-one relationships', async () => {
               user_status: Database["public"]["Enums"]["user_status"] | null
             }
             SetofOptions: {
-              from: "users" | "users_view"
+              from: "*" | "users" | "users_view"
               to: "user_todos_summary_view"
               isOneToOne: true
             }
@@ -1226,7 +1236,7 @@ test('typegen w/ one-to-one relationships', async () => {
               "user-id": number
             }[]
             SetofOptions: {
-              from: "users" | "users_view"
+              from: "*" | "users" | "users_view"
               to: "todos"
               isOneToOne: false
             }
@@ -1241,7 +1251,7 @@ test('typegen w/ one-to-one relationships', async () => {
               "user-id": number
             }[]
             SetofOptions: {
-              from: "users" | "todos"
+              from: "todos" | "users"
               to: "todos"
               isOneToOne: false
             }
@@ -1912,6 +1922,11 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
               name: string | null
               status: Database["public"]["Enums"]["user_status"] | null
             }[]
+            SetofOptions: {
+              from: "*"
+              to: "users"
+              isOneToOne: false
+            }
           }
           function_returning_table: {
             Args: Record<PropertyKey, never>
@@ -1937,7 +1952,7 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
               user_status: Database["public"]["Enums"]["user_status"] | null
             }
             SetofOptions: {
-              from: "users" | "users_view"
+              from: "*" | "users" | "users_view"
               to: "user_todos_summary_view"
               isOneToOne: true
             }
@@ -1953,7 +1968,7 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
               "user-id": number
             }[]
             SetofOptions: {
-              from: "users" | "users_view"
+              from: "*" | "users" | "users_view"
               to: "todos"
               isOneToOne: false
             }
@@ -1968,7 +1983,7 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
               "user-id": number
             }[]
             SetofOptions: {
-              from: "users" | "todos"
+              from: "todos" | "users"
               to: "todos"
               isOneToOne: false
             }