Merge pull request #136 from supabase/fix/func-arg-types

fix: create functions with alias data types

Author: w3b6x9

src/lib/PostgresMetaFunctions.ts

@@ -53,18 +53,39 @@ export default class PostgresMetaFunctions {
         return { data: data[0], error }
       }
     } else if (name && schema && args) {
-      const argTypes = args.join(', ')
-      const sql = `${enrichedFunctionsSql} WHERE schema = ${literal(schema)} AND name = ${literal(
-        name
-      )} AND argument_types = ${literal(argTypes)};`
+      const sql = `${enrichedFunctionsSql} JOIN pg_proc AS p ON id = p.oid WHERE schema = ${literal(
+        schema
+      )} AND name = ${literal(name)} AND 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('')
+      }`
       const { data, error } = await this.query(sql)
       if (error) {
         return { data, error }
       } else if (data.length === 0) {
         return {
           data: null,
           error: {
-            message: `Cannot find function "${schema}"."${name}"(${argTypes})`,
+            message: `Cannot find function "${schema}"."${name}"(${args.join(', ')})`,
           },
         }
       } else {
@@ -84,7 +105,7 @@ export default class PostgresMetaFunctions {
     language = 'sql',
     behavior = 'VOLATILE',
     security_definer = false,
-    config_params,
+    config_params = {},
   }: {
     name: string
     schema?: string
@@ -94,7 +115,7 @@ export default class PostgresMetaFunctions {
     language?: string
     behavior?: 'IMMUTABLE' | 'STABLE' | 'VOLATILE'
     security_definer?: boolean
-    config_params: { [key: string]: string }
+    config_params?: { [key: string]: string }
   }): Promise<PostgresMetaResult<PostgresFunction>> {
     const sql = `
       CREATE FUNCTION ${ident(schema)}.${ident(name)}(${args.join(', ')})
@@ -178,10 +199,10 @@ export default class PostgresMetaFunctions {
 }
 
 const enrichedFunctionsSql = `
-  WITH functions AS (
+  WITH f AS (
     ${functionsSql}
   )
   SELECT
-    *
-  FROM functions
+    f.*
+  FROM f
 `

test/integration/index.spec.js

@@ -161,8 +161,8 @@ describe('/functions', () => {
     id: null,
     name: 'test_func',
     schema: 'public',
-    args: ['integer', 'integer'],
-    definition: 'select $1 + $2',
+    args: ['a int2', 'b int2'],
+    definition: 'select a + b',
     return_type: 'integer',
     language: 'sql',
     behavior: 'STABLE',
@@ -213,6 +213,7 @@ describe('/functions', () => {
     const { data: newFunc } = await axios.post(`${URL}/functions`, func)
     assert.strictEqual(newFunc.name, 'test_func')
     assert.strictEqual(newFunc.schema, 'public')
+    assert.strictEqual(newFunc.argument_types, 'a smallint, b smallint')
     assert.strictEqual(newFunc.language, 'sql')
     assert.strictEqual(newFunc.return_type, 'int4')
     assert.strictEqual(newFunc.behavior, 'STABLE')