feat: add functions args retrieval

Author: avallete

schema-filter-demo.ts

@@ -74,7 +74,7 @@ end $$;
     // Return the updated column privileges for modified columns.
     const columnIds = [...new Set(grants.map(({ column_id }) => column_id))]
     const columnIdsFilter = filterByValue(columnIds)
-    sql = COLUMN_PRIVILEGES_SQL({ schemaFilter: undefined, columnIdsFilter })
+    sql = COLUMN_PRIVILEGES_SQL({ columnIdsFilter })
     return await this.query(sql)
   }
 
@@ -114,7 +114,7 @@ end $$;
     // Return the updated column privileges for modified columns.
     const columnIds = [...new Set(revokes.map(({ column_id }) => column_id))]
     const columnIdsFilter = filterByValue(columnIds)
-    sql = COLUMN_PRIVILEGES_SQL({ schemaFilter: undefined, columnIdsFilter })
+    sql = COLUMN_PRIVILEGES_SQL({ columnIdsFilter })
     return await this.query(sql)
   }
 }

src/lib/PostgresMetaColumnPrivileges.ts

@@ -22,7 +22,7 @@ export default class PostgresMetaExtensions {
   }
 
   async retrieve({ name }: { name: string }): Promise<PostgresMetaResult<PostgresExtension>> {
-    const nameFilter = filterByValue([`${name}`])
+    const nameFilter = filterByValue([name])
     const sql = EXTENSIONS_SQL({ nameFilter })
     const { data, error } = await this.query(sql)
     if (error) {

src/lib/PostgresMetaExtensions.ts

@@ -68,7 +68,7 @@ export default class PostgresMetaFunctions {
       }
     } else if (name && schema && args) {
       const nameFilter = filterByValue([name])
-      const sql = this.generateRetrieveFunctionSql({ schemaFilter, nameFilter, schema, name, args })
+      const sql = FUNCTIONS_SQL({ schemaFilter, nameFilter, args: args.map(literal) })
       const { data, error } = await this.query(sql)
       if (error) {
         return { data, error }
@@ -163,6 +163,11 @@ export default class PostgresMetaFunctions {
           )}(${identityArgs})  SET SCHEMA ${ident(schema)};`
         : ''
 
+    const currentSchemaFilter = currentFunc!.schema
+      ? filterByList([currentFunc!.schema], [])
+      : undefined
+    const currentNameFilter = currentFunc!.name ? filterByValue([currentFunc!.name]) : undefined
+
     const sql = `
       DO LANGUAGE plpgsql $$
       BEGIN
@@ -171,7 +176,7 @@ export default class PostgresMetaFunctions {
 
           IF (
             SELECT id
-            FROM (${FUNCTIONS_SQL({})}) AS f
+            FROM (${FUNCTIONS_SQL({ schemaFilter: currentSchemaFilter, nameFilter: currentNameFilter })}) AS f
             WHERE f.schema = ${literal(currentFunc!.schema)}
             AND f.name = ${literal(currentFunc!.name)}
             AND f.identity_argument_types = ${literal(identityArgs)}
@@ -256,40 +261,4 @@ export default class PostgresMetaFunctions {
       };
     `
   }
-
-  private generateRetrieveFunctionSql({
-    schemaFilter,
-    nameFilter,
-    args,
-  }: {
-    schemaFilter?: string
-    nameFilter?: string
-    schema: string
-    name: string
-    args: string[]
-  }): string {
-    return `${FUNCTIONS_SQL({ schemaFilter, nameFilter })} JOIN pg_proc AS p ON f.oid = p.oid WHERE p.proargtypes::text = ${
-      args.length
-        ? `(
-          SELECT STRING_AGG(type_oid::text, ' ') FROM (
-            SELECT (
-              split_args.arr[
-                array_length(
-                  split_args.arr,
-                  1
-                )
-              ]::regtype::oid
-            ) AS type_oid FROM (
-              SELECT STRING_TO_ARRAY(
-                UNNEST(
-                  ARRAY[${args.map(literal)}]
-                ),
-                ' '
-              ) AS arr
-            ) AS split_args
-          ) args
-    )`
-        : literal('')
-    }`
-  }
 }

src/lib/PostgresMetaFunctions.ts

@@ -59,7 +59,7 @@ export default class PostgresMetaSchemas {
         return { data: data[0], error }
       }
     } else if (name) {
-      const nameFilter = filterByValue([`${name}`])
+      const nameFilter = filterByValue([name])
       const sql = SCHEMAS_SQL({ nameFilter })
       const { data, error } = await this.query(sql)
       if (error) {

src/lib/PostgresMetaSchemas.ts

@@ -3,6 +3,7 @@ import type { SQLQueryPropsWithSchemaFilterAndIdsFilter } from './common.js'
 export const FUNCTIONS_SQL = (
   props: SQLQueryPropsWithSchemaFilterAndIdsFilter & {
     nameFilter?: string
+    args?: string[]
   }
 ) => /* SQL */ `
 -- CTE with sane arg_modes, arg_names, and arg_types.
@@ -33,6 +34,33 @@ with functions as (
     ${props.schemaFilter ? `n.nspname ${props.schemaFilter} AND` : ''}
     ${props.idsFilter ? `p.oid ${props.idsFilter} AND` : ''}
     ${props.nameFilter ? `p.proname ${props.nameFilter} AND` : ''}
+    ${
+      props.args && props.args.length > 0
+        ? `p.proargtypes::text = ${
+            props.args.length
+              ? `(
+          SELECT STRING_AGG(type_oid::text, ' ') FROM (
+            SELECT (
+              split_args.arr[
+                array_length(
+                  split_args.arr,
+                  1
+                )
+              ]::regtype::oid
+            ) AS type_oid FROM (
+              SELECT STRING_TO_ARRAY(
+                UNNEST(
+                  ARRAY[${props.args}]
+                ),
+                ' '
+              ) AS arr
+            ) AS split_args
+          ) args
+    )`
+              : "''"
+          } AND`
+        : ''
+    }
     p.prokind = 'f'
 )
 select