@teamkeel/functions-runtime 0.366.0-audit-logs0 → 0.366.0-prerelease0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamkeel/functions-runtime",
-  "version": "0.366.0-audit-logs0",
+  "version": "0.366.0-prerelease0",
   "description": "Internal package used by @teamkeel/sdk",
   "main": "src/index.js",
   "scripts": {

package/src/auditing.js

@@ -44,14 +44,6 @@ class AuditContextPlugin {
     this.traceIdAlias = "__keel_trace_id";
   }
 
-  #setIdentityClause(value) {
-    return `set_identity_id('${value}')`;
-  }
-
-  #setTraceIdClause(value) {
-    return `set_trace_id('${value}')`;
-  }
-
   // Appends set_identity_id() and set_trace_id() function calls to the returning statement
   // of INSERT, UPDATE and DELETE operations.
   transformQuery(args) {
@@ -59,10 +51,13 @@ class AuditContextPlugin {
       case "InsertQueryNode":
       case "UpdateQueryNode":
       case "DeleteQueryNode":
+        // Represents a RETURNING clause in a SQL statement.
         const returning = {
           kind: "ReturningNode",
           selections: [],
         };
+
+        // If the query already has a selection, then append it.
         if (args.node.returning) {
           returning.selections.push(...args.node.returning.selections);
         }
@@ -71,10 +66,7 @@ class AuditContextPlugin {
         const audit = getAuditContext();
 
         if (audit.identityId) {
-          const rawNode = sql
-            .raw(
-              this.#setIdentityClause(audit.identityId, this.identityIdAlias)
-            )
+          const rawNode = sql`set_identity_id(${audit.identityId})`
             .as(this.identityIdAlias)
             .toOperationNode();
 
@@ -82,8 +74,7 @@ class AuditContextPlugin {
         }
 
         if (audit.traceId) {
-          const rawNode = sql
-            .raw(this.#setTraceIdClause(audit.traceId))
+          const rawNode = sql`set_trace_id(${audit.traceId})`
             .as(this.traceIdAlias)
             .toOperationNode();
 

package/src/database.js

@@ -129,7 +129,7 @@ class InstrumentedClient extends pg.Client {
       sqlAttribute = true;
     }
 
-    return await withSpan(spanName, function (span) {
+    return withSpan(spanName, function (span) {
       if (sqlAttribute) {
         span.setAttribute("sql", args[0]);
       }

package/src/handleRequest.test.js

@@ -282,4 +282,77 @@ describe("ModelAPI error handling", () => {
       },
     });
   });
+  test("when there is a uniqueness constraint error", async () => {
+    await sql`
+    INSERT INTO post (id, title, author_id) values(${
+      KSUID.randomSync().string
+    }, 'hello', 'adam')
+    `.execute(db);
+
+    const rpcReq = createJSONRPCRequest("123", "createPost", {
+      title: "hello",
+      author_id: "something",
+    });
+
+    expect(await handleRequest(rpcReq, functionConfig)).toEqual({
+      id: "123",
+      jsonrpc: "2.0",
+      error: {
+        code: RuntimeErrors.UniqueConstraintError,
+        message:
+          'duplicate key value violates unique constraint "post_title_key"',
+        data: {
+          code: "23505",
+          column: "title",
+          detail: "Key (title)=(hello) already exists.",
+          table: "post",
+          value: "hello",
+        },
+      },
+    });
+  });
+
+  test("when there is a null value in a foreign key column", async () => {
+    const rpcReq = createJSONRPCRequest("123", "createPost", { title: "123" });
+
+    expect(await handleRequest(rpcReq, functionConfig)).toEqual({
+      id: "123",
+      jsonrpc: "2.0",
+      error: {
+        code: RuntimeErrors.NotNullConstraintError,
+        message:
+          'null value in column "author_id" violates not-null constraint',
+        data: {
+          code: "23502",
+          column: "author_id",
+          detail: expect.stringContaining("Failing row contains"),
+          table: "post",
+        },
+      },
+    });
+  });
+
+  test("when there is a foreign key constraint violation", async () => {
+    const rpcReq2 = createJSONRPCRequest("123", "createPost", {
+      title: "123",
+      author_id: "fake",
+    });
+
+    expect(await handleRequest(rpcReq2, functionConfig)).toEqual({
+      id: "123",
+      jsonrpc: "2.0",
+      error: {
+        code: RuntimeErrors.ForeignKeyConstraintError,
+        message:
+          'insert or update on table "post" violates foreign key constraint "post_author_id_fkey"',
+        data: {
+          code: "23503",
+          column: "author_id",
+          detail: 'Key (author_id)=(fake) is not present in table "author".',
+          table: "post",
+          value: "fake",
+        },
+      },
+    });
+  });
 });