@heyhru/app-dms-server 0.7.0 → 0.8.0

package/dist/index.js

@@ -252,20 +252,28 @@ function postSqlParse(req, reply) {
   return reply.send({ category: sqlParse(sql) });
 }
 async function postSqlExecute(req, reply) {
-  const { dataSourceId, database, sql } = req.body ?? {};
+  const body = req.body ?? {};
+  const { dataSourceId, database, sql } = body;
   if (!dataSourceId || !sql) {
     return reply.code(400).send({ error: "\u6570\u636E\u6E90 ID \u548C SQL \u4E0D\u80FD\u4E3A\u7A7A" });
   }
+  const page = typeof body.page === "number" ? body.page : 1;
+  const pageSize = typeof body.pageSize === "number" ? body.pageSize : 50;
   const ip = req.headers["x-forwarded-for"] ?? req.headers["x-real-ip"] ?? "unknown";
   try {
-    const rows = await sqlExecute({ dataSourceId, database, sql, userId: req.user.id, ip });
-    return reply.send({ rows });
+    const result = await sqlExecute({ dataSourceId, database, sql, userId: req.user.id, ip, page, pageSize });
+    return reply.send(result);
   } catch (err) {
     req.log.error(err, "SQL execute failed (user=%s, ds=%s)", req.user.id, dataSourceId);
     return reply.code(400).send({ error: err instanceof Error ? err.message : String(err) });
   }
 }
-async function sqlExecute({ dataSourceId, database, sql, userId, ip }) {
+async function fetchCountQuery(pool, sql) {
+  const countSql = `SELECT COUNT(*) AS total FROM (${sql}) AS _count_t`;
+  const rows = await pool.execute(countSql);
+  return Number(rows[0]?.total ?? 0);
+}
+async function sqlExecute({ dataSourceId, database, sql, userId, ip, page, pageSize }) {
   const category = sqlParse(sql);
   if (category !== "select") {
     throw new Error("\u4EC5\u5141\u8BB8\u76F4\u63A5\u6267\u884C SELECT \u8BED\u53E5");
@@ -275,10 +283,20 @@ async function sqlExecute({ dataSourceId, database, sql, userId, ip }) {
     return ds ? getPool(ds) : null;
   })();
   if (!pool) throw new Error("\u6570\u636E\u6E90\u672A\u627E\u5230");
+  const hasLimit = /\bLIMIT\b/i.test(sql);
+  const dataSql = hasLimit ? sql : `${sql} LIMIT ${pageSize} OFFSET ${(page - 1) * pageSize}`;
   const end = sqlDuration.startTimer({ data_source_id: dataSourceId, sql_type: category });
   let rows;
+  let total;
   try {
-    rows = await pool.execute(sql);
+    if (hasLimit) {
+      rows = await pool.execute(dataSql);
+      total = rows.length;
+    } else {
+      const [rawRows, count] = await Promise.all([pool.execute(dataSql), fetchCountQuery(pool, sql)]);
+      rows = rawRows;
+      total = count;
+    }
     end({ status: "success" });
   } catch (err) {
     end({ status: "failed" });
@@ -289,10 +307,10 @@ async function sqlExecute({ dataSourceId, database, sql, userId, ip }) {
     dataSourceId,
     action: "SELECT",
     sqlText: sql,
-    resultSummary: `${rows.length} rows`,
+    resultSummary: `${total} total rows`,
     ipAddress: ip
   });
-  return rows;
+  return { rows, total, page, pageSize };
 }
 async function postSqlDatabases(req, reply) {
   const { dataSourceId } = req.body ?? {};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "DMS backend API server built on Fastify",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -19,9 +19,9 @@
   },
   "dependencies": {
     "@fastify/cors": "^11.2.0",
-    "@heyhru/business-dms-approval": "0.6.1",
+    "@heyhru/business-dms-approval": "0.6.2",
     "@heyhru/business-dms-audit": "0.6.1",
-    "@heyhru/business-dms-datasource": "0.7.0",
+    "@heyhru/business-dms-datasource": "0.7.1",
     "@heyhru/business-dms-saved-sql": "0.6.1",
     "@heyhru/business-dms-user": "0.6.1",
     "@heyhru/common-util-logger": "0.6.0",
@@ -42,5 +42,5 @@
     "typescript": "^6.0.2",
     "vitest": "^4.1.4"
   },
-  "gitHead": "b9097b9ad29ac4c0c3610a39cb0db83f74a11fb8"
+  "gitHead": "b20e6c3e571bd4939fd32ece8f5bc6d8302a4c83"
 }