@carbonorm/carbonnode 6.0.18 → 6.0.20

package/src/__tests__/sakila-db/sqlResponses/C6.payment.post.json

@@ -1,7 +1,17 @@
 {
   "affected": 1,
   "insertId": 16050,
-  "rest": [],
+  "rest": [
+    {
+      "customer_id": 2,
+      "staff_id": 1,
+      "rental_id": 1,
+      "amount": 1,
+      "payment_date": "2026-02-13 17:56:13",
+      "last_update": "2026-02-13 17:56:13",
+      "payment_id": 16050
+    }
+  ],
   "sql": {
     "sql": "INSERT INTO `payment` (\n            `customer_id`, `staff_id`, `rental_id`, `amount`, `payment_date`, `last_update`\n         ) VALUES\n            (?, ?, ?, ?, ?, ?)",
     "values": [
@@ -9,8 +19,8 @@
       1,
       1,
       1,
-      "2026-02-12 22:07:32",
-      "2026-02-12 22:07:32"
+      "2026-02-13 17:56:13",
+      "2026-02-13 17:56:13"
     ]
   }
 }

package/src/__tests__/sakila-db/sqlResponses/C6.payment.post.latest.json

@@ -6,8 +6,8 @@
       "staff_id": 1,
       "rental_id": 1,
       "amount": "1.00",
-      "payment_date": "2026-02-12T22:07:32.000Z",
-      "last_update": "2026-02-12T22:07:32.000Z"
+      "payment_date": "2026-02-13T17:56:13.000Z",
+      "last_update": "2026-02-13T17:56:13.000Z"
     }
   ],
   "sql": {

package/src/__tests__/sakila-db/sqlResponses/C6.payment.put.lookup.json

@@ -6,8 +6,8 @@
       "staff_id": 1,
       "rental_id": 1,
       "amount": "1.00",
-      "payment_date": "2026-02-12T22:07:32.000Z",
-      "last_update": "2026-02-12T22:07:32.000Z"
+      "payment_date": "2026-02-13T17:56:13.000Z",
+      "last_update": "2026-02-13T17:56:13.000Z"
     }
   ],
   "sql": {

package/src/__tests__/sakila-db/sqlResponses/C6.rental.post.json

@@ -1,16 +1,26 @@
 {
   "affected": 1,
   "insertId": 16050,
-  "rest": [],
+  "rest": [
+    {
+      "rental_date": "2026-02-13 17:56:13",
+      "inventory_id": 1,
+      "customer_id": 1,
+      "return_date": "2026-02-13 17:56:13",
+      "staff_id": 1,
+      "last_update": "2026-02-13 17:56:13",
+      "rental_id": 16050
+    }
+  ],
   "sql": {
     "sql": "INSERT INTO `rental` (\n            `rental_date`, `inventory_id`, `customer_id`, `return_date`, `staff_id`, `last_update`\n         ) VALUES\n            (?, ?, ?, ?, ?, ?)",
     "values": [
-      "2026-02-12 22:07:32",
+      "2026-02-13 17:56:13",
       1,
       1,
-      "2026-02-12 22:07:32",
+      "2026-02-13 17:56:13",
       1,
-      "2026-02-12 22:07:32"
+      "2026-02-13 17:56:13"
     ]
   }
 }

package/src/__tests__/sakila-db/sqlResponses/C6.rental.post.latest.json

@@ -2,12 +2,12 @@
   "rest": [
     {
       "rental_id": 16050,
-      "rental_date": "2026-02-12T22:07:32.000Z",
+      "rental_date": "2026-02-13T17:56:13.000Z",
       "inventory_id": 1,
       "customer_id": 1,
-      "return_date": "2026-02-12T22:07:32.000Z",
+      "return_date": "2026-02-13T17:56:13.000Z",
       "staff_id": 1,
-      "last_update": "2026-02-12T22:07:32.000Z"
+      "last_update": "2026-02-13T17:56:13.000Z"
     }
   ],
   "sql": {

package/src/__tests__/sakila-db/sqlResponses/C6.rental.put.json

@@ -5,7 +5,7 @@
   "sql": {
     "sql": "UPDATE `rental` SET `rental_date` = ? WHERE (rental.rental_id) = ?",
     "values": [
-      "2026-02-12 22:07:32",
+      "2026-02-13 17:56:13",
       16050
     ]
   }

package/src/__tests__/sakila-db/sqlResponses/C6.rental.put.lookup.json

@@ -2,12 +2,12 @@
   "rest": [
     {
       "rental_id": 16050,
-      "rental_date": "2026-02-12T22:07:32.000Z",
+      "rental_date": "2026-02-13T17:56:13.000Z",
       "inventory_id": 1,
       "customer_id": 1,
-      "return_date": "2026-02-12T22:07:32.000Z",
+      "return_date": "2026-02-13T17:56:13.000Z",
       "staff_id": 1,
-      "last_update": "2026-02-12T22:07:32.000Z"
+      "last_update": "2026-02-13T17:56:13.000Z"
     }
   ],
   "sql": {

package/src/__tests__/sqlExecutorPostUuid.test.ts

@@ -0,0 +1,185 @@
+import { describe, expect, it, vi } from "vitest";
+import { SqlExecutor } from "../executors/SqlExecutor";
+
+function buildLifecycleHooks() {
+  return { GET: {}, POST: {}, PUT: {}, DELETE: {} } as any;
+}
+
+function buildUuidPrimaryConfig(conn: any) {
+  const restModel: any = {
+    TABLE_NAME: "report_dashboards",
+    PRIMARY: ["report_dashboards.dashboard_id"],
+    PRIMARY_SHORT: ["dashboard_id"],
+    COLUMNS: {
+      "report_dashboards.dashboard_id": "dashboard_id",
+      "report_dashboards.title": "title",
+      "report_dashboards.created_by": "created_by",
+    },
+    TYPE_VALIDATION: {
+      "report_dashboards.dashboard_id": {
+        MYSQL_TYPE: "binary",
+        MAX_LENGTH: "16",
+        AUTO_INCREMENT: false,
+        SKIP_COLUMN_IN_POST: false,
+      },
+      "report_dashboards.title": {
+        MYSQL_TYPE: "varchar",
+        MAX_LENGTH: "120",
+        AUTO_INCREMENT: false,
+        SKIP_COLUMN_IN_POST: false,
+      },
+      "report_dashboards.created_by": {
+        MYSQL_TYPE: "varchar",
+        MAX_LENGTH: "255",
+        AUTO_INCREMENT: false,
+        SKIP_COLUMN_IN_POST: false,
+      },
+    },
+    LIFECYCLE_HOOKS: buildLifecycleHooks(),
+  };
+
+  return {
+    requestMethod: "POST",
+    mysqlPool: {
+      getConnection: vi.fn(async () => conn),
+    },
+    C6: {
+      PREFIX: "",
+      TABLES: {
+        report_dashboards: restModel,
+      },
+    },
+    restModel,
+  } as any;
+}
+
+function buildAutoIncrementConfig(conn: any) {
+  const restModel: any = {
+    TABLE_NAME: "widgets",
+    PRIMARY: ["widgets.widget_id"],
+    PRIMARY_SHORT: ["widget_id"],
+    COLUMNS: {
+      "widgets.widget_id": "widget_id",
+      "widgets.name": "name",
+    },
+    TYPE_VALIDATION: {
+      "widgets.widget_id": {
+        MYSQL_TYPE: "int",
+        MAX_LENGTH: "11",
+        AUTO_INCREMENT: true,
+        SKIP_COLUMN_IN_POST: false,
+      },
+      "widgets.name": {
+        MYSQL_TYPE: "varchar",
+        MAX_LENGTH: "120",
+        AUTO_INCREMENT: false,
+        SKIP_COLUMN_IN_POST: false,
+      },
+    },
+    LIFECYCLE_HOOKS: buildLifecycleHooks(),
+  };
+
+  return {
+    requestMethod: "POST",
+    mysqlPool: {
+      getConnection: vi.fn(async () => conn),
+    },
+    C6: {
+      PREFIX: "",
+      TABLES: {
+        widgets: restModel,
+      },
+    },
+    restModel,
+  } as any;
+}
+
+function buildWriteConn(affectedRows = 1, insertId = 0) {
+  return {
+    beginTransaction: vi.fn(async () => undefined),
+    query: vi.fn(async () => [{ affectedRows, insertId }, []]),
+    commit: vi.fn(async () => undefined),
+    rollback: vi.fn(async () => undefined),
+    release: vi.fn(),
+  };
+}
+
+function expectUuidV7Hex(value: unknown) {
+  expect(typeof value).toBe("string");
+  const hex = String(value).toUpperCase();
+  expect(hex).toMatch(/^[0-9A-F]{32}$/);
+  expect(hex[12]).toBe("7");
+  expect(hex[16]).toMatch(/[89AB]/);
+}
+
+describe("SqlExecutor POST UUID synthesis", () => {
+  it("generates missing UUID primary keys for POST and populates rest payload", async () => {
+    const conn = buildWriteConn(1, 0);
+    const config = buildUuidPrimaryConfig(conn);
+    const request: any = {
+      title: "Board One",
+      created_by: "user-1",
+    };
+
+    const executor = new SqlExecutor<any>(config, request);
+    const result: any = await executor.execute();
+
+    expect(Array.isArray(result.rest)).toBe(true);
+    expect(result.rest).toHaveLength(1);
+    expect(result.rest[0]).toMatchObject({
+      title: "Board One",
+      created_by: "user-1",
+    });
+    expectUuidV7Hex(result.rest[0].dashboard_id);
+
+    const [sql, values] = conn.query.mock.calls[0];
+    expect(sql).toContain("INSERT INTO `report_dashboards`");
+    const uuidBuffers = (values as any[]).filter((value) => Buffer.isBuffer(value));
+    expect(uuidBuffers).toHaveLength(1);
+    expect(uuidBuffers[0]).toHaveLength(16);
+  });
+
+  it("generates UUIDs for each multi-row insert payload row", async () => {
+    const conn = buildWriteConn(2, 0);
+    const config = buildUuidPrimaryConfig(conn);
+    const request: any = {
+      dataInsertMultipleRows: [
+        { title: "One", created_by: "user-1" },
+        { title: "Two", created_by: "user-1" },
+      ],
+    };
+
+    const executor = new SqlExecutor<any>(config, request);
+    const result: any = await executor.execute();
+
+    expect(Array.isArray(result.rest)).toBe(true);
+    expect(result.rest).toHaveLength(2);
+    expectUuidV7Hex(result.rest[0].dashboard_id);
+    expectUuidV7Hex(result.rest[1].dashboard_id);
+    expect(result.rest[0].dashboard_id).not.toBe(result.rest[1].dashboard_id);
+
+    const [, values] = conn.query.mock.calls[0];
+    const uuidBuffers = (values as any[]).filter((value) => Buffer.isBuffer(value));
+    expect(uuidBuffers).toHaveLength(2);
+    expect(uuidBuffers[0]).toHaveLength(16);
+    expect(uuidBuffers[1]).toHaveLength(16);
+  });
+
+  it("fills response rest primary key from insertId for autoincrement inserts", async () => {
+    const conn = buildWriteConn(1, 42);
+    const config = buildAutoIncrementConfig(conn);
+    const request: any = {
+      name: "Auto Row",
+    };
+
+    const executor = new SqlExecutor<any>(config, request);
+    const result: any = await executor.execute();
+
+    expect(Array.isArray(result.rest)).toBe(true);
+    expect(result.rest).toHaveLength(1);
+    expect(result.rest[0]).toMatchObject({
+      widget_id: 42,
+      name: "Auto Row",
+    });
+  });
+});

package/src/executors/HttpExecutor.ts

@@ -14,6 +14,7 @@ import {
 } from "../types/ormInterfaces";
 import {removeInvalidKeys, removePrefixIfExists, TestRestfulResponse} from "../utils/apiHelpers";
 import {checkCache, evictCacheEntry, setCache, userCustomClearCache} from "../utils/cacheManager";
+import type { SqlAllowListStatus } from "../utils/logSql";
 import {sortAndSerializeQueryObject} from "../utils/sortAndSerializeQueryObject";
 import {notifyToast} from "../utils/toastRuntime";
 import {Executor} from "./Executor";
@@ -81,11 +82,18 @@ export class HttpExecutor<
     ) {
         type RT = G['RestTableInterface'];
         type PK = G['PrimaryKey'];
+        const responseRestRaw = (response.data as any)?.rest;
+        const responseRows: Record<string, any>[] = Array.isArray(responseRestRaw)
+            ? responseRestRaw
+            : (responseRestRaw ? [responseRestRaw] : []);
 
         if (this.config.restModel.PRIMARY_SHORT.length === 1) {
             const pk = this.config.restModel.PRIMARY_SHORT[0] as PK;
             try {
-                (request as unknown as Record<PK, RT[PK]>)[pk] = (response.data as any)?.created as RT[PK];
+                const created = (response.data as any)?.created ?? responseRows[0]?.[pk as string];
+                if (created !== undefined) {
+                    (request as unknown as Record<PK, RT[PK]>)[pk] = created as RT[PK];
+                }
             } catch {/* best-effort */}
         } else if (isLocal()) {
             logWithLevel(
@@ -103,13 +111,13 @@ export class HttpExecutor<
                     const normalizedRow = this.stripTableNameFromKeys<RT>(row as Partial<RT>);
                     return removeInvalidKeys<RT>({
                         ...normalizedRow,
-                        ...(index === 0 ? (response?.data as any)?.rest : {}),
+                        ...(responseRows[index] ?? {}),
                     }, this.config.C6.TABLES)
                 })
                 : [
                     removeInvalidKeys<RT>({
                         ...this.stripTableNameFromKeys<RT>(request as unknown as Partial<RT>),
-                        ...(response?.data as any)?.rest,
+                        ...(responseRows[0] ?? {}),
                     }, this.config.C6.TABLES)
                 ],
             stateKey: this.config.restModel.TABLE_NAME,
@@ -253,10 +261,19 @@ export class HttpExecutor<
                 G['CustomAndRequiredFields'],
                 G['RequestTableOverrides']
             >;
+            const cacheAllowListStatus: SqlAllowListStatus = this.config.sqlAllowListPath
+                ? "allowed"
+                : "not verified";
 
             const evictFromCache =
                 requestMethod === GET && cacheResults
-                    ? () => evictCacheEntry(requestMethod, tableName, cacheRequestData)
+                    ? () => evictCacheEntry(
+                        requestMethod,
+                        tableName,
+                        cacheRequestData,
+                        logContext,
+                        cacheAllowListStatus,
+                    )
                     : undefined;
 
             // literally impossible for query to be undefined or null here but the editor is too busy licking windows to understand that
@@ -265,7 +282,13 @@ export class HttpExecutor<
             let cachedRequest: Promise<{ data: ResponseDataType }> | false = false;
 
             if (cacheResults) {
-                cachedRequest = checkCache<ResponseDataType>(requestMethod, tableName, cacheRequestData, logContext);
+                cachedRequest = checkCache<ResponseDataType>(
+                    requestMethod,
+                    tableName,
+                    cacheRequestData,
+                    logContext,
+                    cacheAllowListStatus,
+                );
             }
 
             if (cachedRequest) {
@@ -464,6 +487,7 @@ export class HttpExecutor<
                     setCache<ResponseDataType>(requestMethod, tableName, cacheRequestData, {
                         requestArgumentsSerialized: querySerialized,
                         request: axiosActiveRequest,
+                        allowListStatus: cacheAllowListStatus,
                     });
                 }
 
@@ -480,6 +504,7 @@ export class HttpExecutor<
                                 setCache<ResponseDataType>(requestMethod, tableName, cacheRequestData, {
                                     requestArgumentsSerialized: querySerialized,
                                     request: axiosActiveRequest,
+                                    allowListStatus: cacheAllowListStatus,
                                     response,
                                     final: true,
                                 });
@@ -503,6 +528,7 @@ export class HttpExecutor<
                             setCache<ResponseDataType>(requestMethod, tableName, cacheRequestData, {
                                 requestArgumentsSerialized: querySerialized,
                                 request: axiosActiveRequest,
+                                allowListStatus: cacheAllowListStatus,
                                 response,
                             });
                         }
@@ -582,6 +608,7 @@ export class HttpExecutor<
                                 setCache<ResponseDataType>(requestMethod, tableName, cacheRequestData, {
                                     requestArgumentsSerialized: querySerialized,
                                     request: axiosActiveRequest,
+                                    allowListStatus: cacheAllowListStatus,
                                     response,
                                     final: !hasNext,
                                 });
@@ -870,6 +897,7 @@ export class HttpExecutor<
                             setCache<ResponseDataType>(requestMethod, tableName, cacheRequestData, {
                                 requestArgumentsSerialized: querySerialized,
                                 request: axiosActiveRequest,
+                                allowListStatus: cacheAllowListStatus,
                                 response,
                                 final: true,
                             });