Merge branch 'master' into chore/revert-deps-upgrade

Author: avallete

package-lock.json

@@ -29,7 +29,7 @@
     "dev": "trap 'npm run db:clean' INT && run-s db:clean db:run && nodemon --exec node --loader ts-node/esm src/server/server.ts | pino-pretty --colorize",
     "test": "run-s db:clean db:run test:run db:clean",
     "db:clean": "cd test/db && docker compose down",
-    "db:run": "cd test/db && docker compose up --detach && sleep 5",
+    "db:run": "cd test/db && docker compose up --detach --wait",
     "test:run": "vitest run",
     "test:update": "run-s db:clean db:run && vitest run --update && run-s db:clean"
   },

package.json

@@ -29,7 +29,7 @@ ON pg_t.tgrelid = pg_c.oid
 JOIN information_schema.triggers AS is_t
 ON is_t.trigger_name = pg_t.tgname
 AND pg_c.relname = is_t.event_object_table
-AND pg_c.relnamespace = is_t.event_object_schema::regnamespace
+AND pg_c.relnamespace = (quote_ident(is_t.event_object_schema))::regnamespace
 JOIN pg_proc AS pg_p
 ON pg_t.tgfoid = pg_p.oid
 JOIN pg_namespace AS pg_n

src/lib/sql/triggers.sql

@@ -8,3 +8,9 @@ services:
     environment:
       POSTGRES_PASSWORD: postgres
     command: postgres -c config_file=/etc/postgresql/postgresql.conf -c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 1s
+      timeout: 2s
+      retries: 10
+      start_period: 2s

test/db/docker-compose.yml

@@ -264,3 +264,51 @@ create schema s2; create table s2.t(); create trigger tr before insert on s2.t e
 
   await pgMeta.query('drop schema s1 cascade; drop schema s2 cascade;')
 })
+
+test('triggers on capitalized schema and table names', async () => {
+  await pgMeta.query(`
+CREATE SCHEMA "MySchema";
+CREATE TABLE "MySchema"."MyTable" (
+   id SERIAL PRIMARY KEY,
+   name TEXT NOT NULL,
+   created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+   updated_at TIMESTAMP
+);
+CREATE OR REPLACE FUNCTION "MySchema"."my_trigger_function"()
+RETURNS TRIGGER AS $$
+BEGIN
+   NEW.updated_at := CURRENT_TIMESTAMP;
+   RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER "my_trigger"
+BEFORE INSERT ON "MySchema"."MyTable"
+FOR EACH ROW
+EXECUTE FUNCTION "MySchema"."my_trigger_function"();
+`)
+
+  const res = await pgMeta.triggers.list()
+  const triggers = res.data?.map(({ id, table_id, ...trigger }) => trigger)
+  expect(triggers).toMatchInlineSnapshot(`
+    [
+      {
+        "activation": "BEFORE",
+        "condition": null,
+        "enabled_mode": "ORIGIN",
+        "events": [
+          "INSERT",
+        ],
+        "function_args": [],
+        "function_name": "my_trigger_function",
+        "function_schema": "MySchema",
+        "name": "my_trigger",
+        "orientation": "ROW",
+        "schema": "MySchema",
+        "table": "MyTable",
+      },
+    ]
+  `)
+
+  await pgMeta.query('drop schema "MySchema" cascade;')
+})