fix: set-returning function return_type

Author: soedirgo

src/lib/sql/functions.sql

@@ -40,7 +40,8 @@ select
   coalesce(f_args.args, '[]') as args,
   pg_get_function_arguments(f.oid) as argument_types,
   pg_get_function_identity_arguments(f.oid) as identity_argument_types,
-  rt.typname as return_type,
+  f.prorettype::int8 as return_type_id,
+  pg_get_function_result(f.oid) as return_type,
   nullif(rt.typrelid::int8, 0) as return_type_relation_id,
   f.proretset as is_set_returning_function,
   case

src/lib/types.ts

@@ -107,6 +107,7 @@ const postgresFunctionSchema = Type.Object({
   ),
   argument_types: Type.String(),
   identity_argument_types: Type.String(),
+  return_type_id: Type.Integer(),
   return_type: Type.String(),
   return_type_relation_id: Type.Union([Type.Integer(), Type.Null()]),
   is_set_returning_function: Type.Boolean(),

src/server/templates/typescript.ts

@@ -224,7 +224,7 @@ export interface Database {
                     .map(
                       ({
                         args,
-                        return_type,
+                        return_type_id,
                         return_type_relation_id,
                         is_set_returning_function,
                       }) => `{
@@ -312,7 +312,12 @@ export interface Database {
                     }
 
                     // Case 3: returns base/composite/enum type.
-                    return pgTypeToTsType(return_type, types, schemas)
+                    const type = types.find(({ id }) => id === return_type_id)
+                    if (type) {
+                      return pgTypeToTsType(type.name, types, schemas)
+                    }
+
+                    return 'unknown'
                   })()})${is_set_returning_function ? '[]' : ''}
                 }`
                     )

test/lib/functions.ts

@@ -35,7 +35,8 @@ test('list', async () => {
       "is_set_returning_function": false,
       "language": "sql",
       "name": "add",
-      "return_type": "int4",
+      "return_type": "integer",
+      "return_type_id": 23,
       "return_type_relation_id": null,
       "schema": "public",
       "security_definer": false,
@@ -134,7 +135,8 @@ test('retrieve, create, update, delete', async () => {
         "is_set_returning_function": false,
         "language": "sql",
         "name": "test_func",
-        "return_type": "int4",
+        "return_type": "integer",
+        "return_type_id": 23,
         "return_type_relation_id": null,
         "schema": "public",
         "security_definer": true,
@@ -183,7 +185,8 @@ test('retrieve, create, update, delete', async () => {
         "is_set_returning_function": false,
         "language": "sql",
         "name": "test_func",
-        "return_type": "int4",
+        "return_type": "integer",
+        "return_type_id": 23,
         "return_type_relation_id": null,
         "schema": "public",
         "security_definer": true,
@@ -236,7 +239,8 @@ test('retrieve, create, update, delete', async () => {
         "is_set_returning_function": false,
         "language": "sql",
         "name": "test_func_renamed",
-        "return_type": "int4",
+        "return_type": "integer",
+        "return_type_id": 23,
         "return_type_relation_id": null,
         "schema": "test_schema",
         "security_definer": true,
@@ -285,7 +289,8 @@ test('retrieve, create, update, delete', async () => {
         "is_set_returning_function": false,
         "language": "sql",
         "name": "test_func_renamed",
-        "return_type": "int4",
+        "return_type": "integer",
+        "return_type_id": 23,
         "return_type_relation_id": null,
         "schema": "test_schema",
         "security_definer": true,
@@ -304,3 +309,43 @@ test('retrieve, create, update, delete', async () => {
 
   await pgMeta.schemas.remove(testSchemaId)
 })
+
+test('retrieve set-returning function', async () => {
+  const res = await pgMeta.functions.retrieve({
+    schema: 'public',
+    name: 'function_returning_set_of_rows',
+    args: [],
+  })
+  expect(res.data).toMatchInlineSnapshot(
+    { id: expect.any(Number) },
+    `
+    {
+      "args": [],
+      "argument_types": "",
+      "behavior": "STABLE",
+      "complete_statement": "CREATE OR REPLACE FUNCTION public.function_returning_set_of_rows()
+     RETURNS SETOF users
+     LANGUAGE sql
+     STABLE
+    AS $function$
+      select * from public.users;
+    $function$
+    ",
+      "config_params": null,
+      "definition": "
+      select * from public.users;
+    ",
+      "id": Any<Number>,
+      "identity_argument_types": "",
+      "is_set_returning_function": true,
+      "language": "sql",
+      "name": "function_returning_set_of_rows",
+      "return_type": "SETOF users",
+      "return_type_id": 16392,
+      "return_type_relation_id": 16390,
+      "schema": "public",
+      "security_definer": false,
+    }
+  `
+  )
+})