feat: add embeded functions introspections

Author: avallete

src/server/app.ts

@@ -3,14 +3,19 @@ import * as Sentry from '@sentry/node'
 import cors from '@fastify/cors'
 import swagger from '@fastify/swagger'
 import { fastify, FastifyInstance, FastifyServerOptions } from 'fastify'
-import { PG_META_REQ_HEADER } from './constants.js'
+import { PG_META_REQ_HEADER, MAX_BODY_LIMIT } from './constants.js'
 import routes from './routes/index.js'
 import { extractRequestForLogging } from './utils.js'
 // Pseudo package declared only for this module
 import pkg from '#package.json' with { type: 'json' }
 
 export const build = (opts: FastifyServerOptions = {}): FastifyInstance => {
-  const app = fastify({ disableRequestLogging: true, requestIdHeader: PG_META_REQ_HEADER, ...opts })
+  const app = fastify({
+    disableRequestLogging: true,
+    requestIdHeader: PG_META_REQ_HEADER,
+    bodyLimit: MAX_BODY_LIMIT,
+    ...opts,
+  })
   Sentry.setupFastifyErrorHandler(app)
 
   app.setErrorHandler((error, request, reply) => {

src/server/constants.ts

@@ -61,6 +61,11 @@ export const PG_META_MAX_RESULT_SIZE = process.env.PG_META_MAX_RESULT_SIZE_MB
     parseInt(process.env.PG_META_MAX_RESULT_SIZE_MB, 10) * 1024 * 1024
   : 2 * 1024 * 1024 * 1024 // default to 2GB max query size result
 
+export const MAX_BODY_LIMIT = process.env.PG_META_MAX_BODY_LIMIT_MB
+  ? // Fastify server max body size allowed, is in bytes, convert from MB to Bytes
+    parseInt(process.env.PG_META_MAX_BODY_LIMIT_MB, 10) * 1024 * 1024
+  : 3 * 1024 * 1024
+
 export const DEFAULT_POOL_CONFIG: PoolConfig = {
   max: 1,
   connectionTimeoutMillis: PG_CONN_TIMEOUT_SECS * 1000,

src/server/templates/swift.ts

@@ -309,6 +309,8 @@ const pgTypeToSwiftType = (
     swiftType = 'Float'
   } else if (pgType === 'float8') {
     swiftType = 'Double'
+  } else if (['numeric', 'decimal'].includes(pgType)) {
+    swiftType = 'Decimal'
   } else if (pgType === 'uuid') {
     swiftType = 'UUID'
   } else if (

src/server/templates/typescript.ts

@@ -137,7 +137,7 @@ export const apply = async ({
   }
 
   const internal_supabase_schema = postgrestVersion
-    ? `// Allows to automatically instanciate createClient with right options
+    ? `// Allows to automatically instantiate createClient with right options
   // instead of createClient<Database, { PostgrestVersion: 'XX' }>(URL, KEY)
   __InternalSupabase: {
     PostgrestVersion: '${postgrestVersion}'
@@ -464,6 +464,7 @@ export type Database = {
                 const fns = _fns.toSorted((a, b) => b.definition.localeCompare(a.definition))
 
                 const functionSignatures = fns.map((fn) => {
+                  fn.args.sort((a, b) => a.name.localeCompare(b.name))
                   const inArgs = fn.args.filter(({ mode }) => VALID_FUNCTION_ARGS_MODE.has(mode))
 
                   // Special error case for functions that take table row but don't qualify as embedded functions

test/db/00-init.sql

@@ -8,7 +8,8 @@ CREATE TYPE composite_type_with_array_attribute AS (my_text_array text[]);
 CREATE TABLE public.users (
   id bigint GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
   name text,
-  status user_status DEFAULT 'ACTIVE'
+  status user_status DEFAULT 'ACTIVE',
+  decimal numeric
 );
 INSERT INTO 
     public.users (name) 
@@ -404,13 +405,13 @@ CREATE OR REPLACE FUNCTION public.function_using_table_returns(user_row users)
 RETURNS todos
 LANGUAGE SQL STABLE
 AS $$
-  SELECT * FROM public.todos WHERE user_id = user_row.id LIMIT 1;
+  SELECT * FROM public.todos WHERE todos."user-id" = user_row.id LIMIT 1;
 $$;
 
 CREATE OR REPLACE FUNCTION public.function_using_setof_rows_one(user_row users)
 RETURNS SETOF todos
 LANGUAGE SQL STABLE
 ROWS 1
 AS $$
-  SELECT * FROM public.todos WHERE user_id = user_row.idLIMIT 1;
+  SELECT * FROM public.todos WHERE todos."user-id" = user_row.id LIMIT 1;
 $$;

test/lib/functions.ts

@@ -80,7 +80,7 @@ test('list set-returning function with single object limit', async () => {
           "definition": "
         SELECT * FROM public.users_audit WHERE user_id = user_row.id;
       ",
-          "id": 16504,
+          "id": 16506,
           "identity_argument_types": "user_row users",
           "is_set_returning_function": true,
           "language": "sql",
@@ -126,7 +126,7 @@ test('list set-returning function with multiples definitions', async () => {
         "definition": "
       SELECT * FROM public.todos WHERE "user-id" = user_row.id;
     ",
-        "id": 16505,
+        "id": 16507,
         "identity_argument_types": "user_row users",
         "is_set_returning_function": true,
         "language": "sql",
@@ -164,7 +164,7 @@ test('list set-returning function with multiples definitions', async () => {
         "definition": "
       SELECT * FROM public.todos WHERE "user-id" = todo_row."user-id";
     ",
-        "id": 16506,
+        "id": 16508,
         "identity_argument_types": "todo_row todos",
         "is_set_returning_function": true,
         "language": "sql",

test/lib/tables.ts

@@ -78,6 +78,24 @@ test('list', async () => {
           "schema": "public",
           "table": "users",
         },
+        {
+          "check": null,
+          "comment": null,
+          "data_type": "numeric",
+          "default_value": null,
+          "enums": [],
+          "format": "numeric",
+          "identity_generation": null,
+          "is_generated": false,
+          "is_identity": false,
+          "is_nullable": true,
+          "is_unique": false,
+          "is_updatable": true,
+          "name": "decimal",
+          "ordinal_position": 4,
+          "schema": "public",
+          "table": "users",
+        },
         {
           "check": null,
           "comment": null,

test/server/query.ts

@@ -10,11 +10,13 @@ test('query', async () => {
   expect(res.json()).toMatchInlineSnapshot(`
     [
       {
+        "decimal": null,
         "id": 1,
         "name": "Joe Bloggs",
         "status": "ACTIVE",
       },
       {
+        "decimal": null,
         "id": 2,
         "name": "Jane Doe",
         "status": "ACTIVE",