@heyhru/business-dms-approval 0.9.1 → 0.10.0

package/dist/index.js

@@ -190,6 +190,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 +230,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

@@ -156,6 +156,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 +196,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.10.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": "9ae6aeb27bf1baa02f538af34d55399d128af62c"
 }