@heyhru/business-dms-approval 0.9.1 → 0.11.0

package/dist/approvals.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approvals.model.d.ts","sourceRoot":"","sources":["../src/approvals.model.ts"],"names":[],"mappings":"AAGA,UAAU,eAAe;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAgBD,wBAAsB,cAAc,CAAC,OAAO,CAAC,EAAE,eAAe,mBAO7D;AAED,wBAAsB,aAAa,CAAC,OAAO,CAAC,EAAE,eAAe,sCAS5D;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,gDAEzC;AAED,UAAU,oBAAoB;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,cAAc,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,OAAe,EAAE,EAAE,oBAAoB,gDAEnH;AAED,wBAAgB,YAAY,CAC1B,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GAAG,IAAI,gDAG5B;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM;;GAEtC;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;GAE1E"}
+{"version":3,"file":"approvals.model.d.ts","sourceRoot":"","sources":["../src/approvals.model.ts"],"names":[],"mappings":"AAGA,UAAU,eAAe;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAgBD,wBAAsB,cAAc,CAAC,OAAO,CAAC,EAAE,eAAe,mBAO7D;AAED,wBAAsB,aAAa,CAAC,OAAO,CAAC,EAAE,eAAe,sCAW5D;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,gDAEzC;AAED,UAAU,oBAAoB;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,cAAc,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,OAAe,EAAE,EAAE,oBAAoB,gDAEnH;AAED,wBAAgB,YAAY,CAC1B,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GAAG,IAAI,gDAG5B;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM;;GAEtC;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;GAE1E"}

package/dist/index.js

@@ -85,9 +85,11 @@ async function countApprovals(filters) {
   return Number(row?.["total"] ?? 0);
 }
 async function listApprovals(filters) {
-  let query = `SELECT a.*, u.username AS submitter_name
+  let query = `SELECT a.*, u.username AS submitter_name,
+       ds.name AS data_source_name, ds.type AS data_source_type
 FROM approvals a
 LEFT JOIN users u ON u.id = a.submitted_by
+LEFT JOIN data_sources ds ON ds.id = a.data_source_id
 WHERE 1=1`;
   const { where, params } = buildWhereParams(filters);
   query += where + " ORDER BY a.created_at DESC LIMIT ? OFFSET ?";
@@ -190,6 +192,31 @@ function approvalExecute(encryptionKey) {
     }
   };
 }
+function splitStatements(sql) {
+  const statements = [];
+  let current = "";
+  let inSingle = false;
+  let inDouble = false;
+  for (let i = 0; i < sql.length; i++) {
+    const ch = sql[i];
+    const prev = sql[i - 1];
+    if (ch === "'" && !inDouble && prev !== "\\") {
+      inSingle = !inSingle;
+    } else if (ch === '"' && !inSingle && prev !== "\\") {
+      inDouble = !inDouble;
+    }
+    if (ch === ";" && !inSingle && !inDouble) {
+      const trimmed2 = current.trim();
+      if (trimmed2) statements.push(trimmed2);
+      current = "";
+    } else {
+      current += ch;
+    }
+  }
+  const trimmed = current.trim();
+  if (trimmed) statements.push(trimmed);
+  return statements;
+}
 async function doExecuteApproval({ id, userId, ip, encryptionKey }, log) {
   const approval = await getApprovalById(id);
   if (!approval || !["approved", "execute_failed"].includes(approval["status"])) {
@@ -205,15 +232,24 @@ async function doExecuteApproval({ id, userId, ip, encryptionKey }, log) {
       return (0, import_business_dms_datasource.getPool)({ ...ds, database: ds.database ?? "" });
     })();
     if (!pool) throw new Error("Data source not found");
-    const rows = await pool.execute(approval["sql_text"]);
-    const result = `${rows.length} rows affected`;
+    const sqlText = approval["sql_text"];
+    const statements = splitStatements(sqlText);
+    let result;
+    if (statements.length <= 1) {
+      const rows = await pool.execute(sqlText);
+      result = `${rows.length} rows affected`;
+    } else {
+      const results = await pool.executeInTransaction(statements);
+      const details = results.map((r) => `${r.rowCount} rows`).join(", ");
+      result = `${statements.length} statements executed (${details})`;
+    }
     await setExecuteResult(id, "executed", result);
-    log.info("Approval executed (id=%s, user=%s)", id, userId);
+    log.info("Approval executed (id=%s, user=%s, stmts=%d)", id, userId, statements.length);
     await (0, import_business_dms_audit.writeAuditLog)({
       userId,
       dataSourceId,
       action: "DML_EXECUTE",
-      sqlText: approval["sql_text"],
+      sqlText,
       resultSummary: result,
       ipAddress: ip
     });

package/dist/index.mjs

@@ -51,9 +51,11 @@ async function countApprovals(filters) {
   return Number(row?.["total"] ?? 0);
 }
 async function listApprovals(filters) {
-  let query = `SELECT a.*, u.username AS submitter_name
+  let query = `SELECT a.*, u.username AS submitter_name,
+       ds.name AS data_source_name, ds.type AS data_source_type
 FROM approvals a
 LEFT JOIN users u ON u.id = a.submitted_by
+LEFT JOIN data_sources ds ON ds.id = a.data_source_id
 WHERE 1=1`;
   const { where, params } = buildWhereParams(filters);
   query += where + " ORDER BY a.created_at DESC LIMIT ? OFFSET ?";
@@ -156,6 +158,31 @@ function approvalExecute(encryptionKey) {
     }
   };
 }
+function splitStatements(sql) {
+  const statements = [];
+  let current = "";
+  let inSingle = false;
+  let inDouble = false;
+  for (let i = 0; i < sql.length; i++) {
+    const ch = sql[i];
+    const prev = sql[i - 1];
+    if (ch === "'" && !inDouble && prev !== "\\") {
+      inSingle = !inSingle;
+    } else if (ch === '"' && !inSingle && prev !== "\\") {
+      inDouble = !inDouble;
+    }
+    if (ch === ";" && !inSingle && !inDouble) {
+      const trimmed2 = current.trim();
+      if (trimmed2) statements.push(trimmed2);
+      current = "";
+    } else {
+      current += ch;
+    }
+  }
+  const trimmed = current.trim();
+  if (trimmed) statements.push(trimmed);
+  return statements;
+}
 async function doExecuteApproval({ id, userId, ip, encryptionKey }, log) {
   const approval = await getApprovalById(id);
   if (!approval || !["approved", "execute_failed"].includes(approval["status"])) {
@@ -171,15 +198,24 @@ async function doExecuteApproval({ id, userId, ip, encryptionKey }, log) {
       return getPool({ ...ds, database: ds.database ?? "" });
     })();
     if (!pool) throw new Error("Data source not found");
-    const rows = await pool.execute(approval["sql_text"]);
-    const result = `${rows.length} rows affected`;
+    const sqlText = approval["sql_text"];
+    const statements = splitStatements(sqlText);
+    let result;
+    if (statements.length <= 1) {
+      const rows = await pool.execute(sqlText);
+      result = `${rows.length} rows affected`;
+    } else {
+      const results = await pool.executeInTransaction(statements);
+      const details = results.map((r) => `${r.rowCount} rows`).join(", ");
+      result = `${statements.length} statements executed (${details})`;
+    }
     await setExecuteResult(id, "executed", result);
-    log.info("Approval executed (id=%s, user=%s)", id, userId);
+    log.info("Approval executed (id=%s, user=%s, stmts=%d)", id, userId, statements.length);
     await writeAuditLog({
       userId,
       dataSourceId,
       action: "DML_EXECUTE",
-      sqlText: approval["sql_text"],
+      sqlText,
       resultSummary: result,
       ipAddress: ip
     });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.9.1",
+  "version": "0.11.0",
   "description": "DMS approval workflow domain logic: service, model, sql",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -26,9 +26,9 @@
     "clean": "rm -rf dist"
   },
   "dependencies": {
-    "@heyhru/business-dms-audit": "0.6.2",
-    "@heyhru/business-dms-datasource": "0.8.2",
-    "@heyhru/server-plugin-pg": "0.7.0",
+    "@heyhru/business-dms-audit": "0.6.3",
+    "@heyhru/business-dms-datasource": "0.8.3",
+    "@heyhru/server-plugin-pg": "0.8.0",
     "fastify": "^5.8.4"
   },
   "devDependencies": {
@@ -36,5 +36,5 @@
     "typescript": "^6.0.2",
     "vitest": "^4.1.4"
   },
-  "gitHead": "f6013af87a27c9ad96b0e078760bd7b3d9832730"
+  "gitHead": "643229b8735627837110392818e8b737a218e32b"
 }