wok-server 0.5.0 → 0.7.0

package/dist/mysql/manager/ops/insert.js

@@ -1,106 +1,132 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.insertMany = exports.insert = void 0;
-const exception_1 = require("../../exception");
-const utils_1 = require("../utils");
-const utils_2 = require("./utils");
-/**
- * 为表插入数据
- * @param connection
- * @param table
- * @param data
- * @returns
- */
-async function insert(config, connection, table, data) {
-    // 插入后的新数据
-    // 列信息，使用 set 防止 columns 中重复配置 id 和更新创建时间列
-    let columnsSet = new Set();
-    // 判定下 id ，如果有值，才在 insert 语句中出现 id 列，否则不出现
-    if (data[table.id]) {
-        columnsSet.add(table.id);
-    }
-    table.columns.forEach(col => columnsSet.add(col));
-    if (table.createdDate) {
-        const createdData = table.createdDate.type === 'date' ? new Date() : new Date().getTime();
-        data[table.createdDate.column] = createdData;
-        columnsSet.add(table.createdDate.column);
-    }
-    if (table.updatedDate) {
-        const updatedDate = table.updatedDate.type === 'date' ? new Date() : new Date().getTime();
-        data[table.updatedDate.column] = updatedDate;
-        columnsSet.add(table.updatedDate.column);
-    }
-    const columns = Array.from(columnsSet);
-    // 构建 sql
-    const sql = `insert into ??(${columns.map(() => '??').join(',')}) values(${columns
-        .map(() => '?')
-        .join(',')})`;
-    const values = [
-        table.tableName,
-        ...columns,
-        ...columns.map(col => (0, utils_2.processColumnValue)(data[col]))
-    ];
-    const res = await (0, utils_1.promiseQuery)(config, connection, sql, values);
-    const packet = res;
-    if (packet.affectedRows !== 1) {
-        throw new exception_1.MysqlException(`Insert failed，table：${table.tableName}，primary key: ${data[table.id]}`);
-    }
-    // 自动生成的id处理
-    if (packet.insertId && (data[table.id] === undefined || data[table.id] === null)) {
-        data[table.id] = packet.insertId;
-    }
-    return data;
-}
-exports.insert = insert;
-/**
- * 一次插入多条记录
- * @param connection 连接
- * @param table 表
- * @param list 要插入的记录列表
- */
-async function insertMany(config, connection, table, list) {
-    if (!list.length) {
-        return;
-    }
-    // 列信息，使用 set 防止 columns 中重复配置 id 和更新创建时间列
-    let columnsSet = new Set();
-    // 批量插入必须统一使用 id 或不使用 id，以第一条记录为准
-    if (list[0][table.id]) {
-        columnsSet.add(table.id);
-    }
-    table.columns.forEach(col => columnsSet.add(col));
-    let createdData = undefined;
-    if (table.createdDate) {
-        createdData = table.createdDate.type === 'date' ? new Date() : new Date().getTime();
-        columnsSet.add(table.createdDate.column);
-    }
-    let updatedDate = undefined;
-    if (table.updatedDate) {
-        updatedDate = table.updatedDate.type === 'date' ? new Date() : new Date().getTime();
-        columnsSet.add(table.updatedDate.column);
-    }
-    const columns = Array.from(columnsSet);
-    // 构建 sql
-    let sql = `insert into ??(${columns.map(() => '??').join(',')}) values`;
-    const values = [table.tableName, ...columns];
-    list.forEach((data, idx) => {
-        if (idx > 0) {
-            sql += ',';
-        }
-        sql += `(${columns.map(() => '?').join(',')})`;
-        if (table.createdDate) {
-            data[table.createdDate.column] = createdData;
-        }
-        if (table.updatedDate) {
-            data[table.updatedDate.column] = updatedDate;
-        }
-        values.push(...columns.map(col => (0, utils_2.processColumnValue)(data[col])));
-    });
-    const res = await (0, utils_1.promiseQuery)(config, connection, sql, values);
-    const rsh = res;
-    if (rsh.affectedRows !== list.length) {
-        throw new exception_1.MysqlException(`Insert many for table ${table.tableName} failed,expected to insert ${list.length} records, actually ${rsh.affectedRows}.`);
-    }
-    // insert 插入多条记录是不会返回生成的 id 的，所以就没有办法自动处理
-}
-exports.insertMany = insertMany;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.insertMany = exports.insert = exports.processInsertValue = void 0;
+const exception_1 = require("../../exception");
+const utils_1 = require("../utils");
+const utils_2 = require("./utils");
+/**
+ * 处理 insert value，支持表达式
+ * @returns { frag: SQL 片段, values: 参数值数组 }
+ */
+function processInsertValue(value) {
+    if (Array.isArray(value)) {
+        if (value[0] === 'now') {
+            return { frag: 'NOW()', values: [] };
+        }
+        if (value[0] === 'set') {
+            return { frag: '?', values: [(0, utils_2.processColumnValue)(value[1])] };
+        }
+        if (value[0] === 'expr') {
+            return { frag: value[1], values: value[2] || [] };
+        }
+    }
+    return { frag: '?', values: [(0, utils_2.processColumnValue)(value)] };
+}
+exports.processInsertValue = processInsertValue;
+/**
+ * 为表插入数据
+ * @param connection
+ * @param table
+ * @param data
+ * @returns
+ */
+async function insert(config, connection, table, data) {
+    // 列信息，使用 set 防止 columns 中重复配置 id 和更新创建时间列
+    let columnsSet = new Set();
+    // 判定下 id ，如果有值，才在 insert 语句中出现 id 列，否则不出现
+    if (data[table.id]) {
+        columnsSet.add(table.id);
+    }
+    table.columns.forEach(col => columnsSet.add(col));
+    if (table.createdDate) {
+        const createdData = table.createdDate.type === 'date' ? new Date() : new Date().getTime();
+        data[table.createdDate.column] = createdData;
+        columnsSet.add(table.createdDate.column);
+    }
+    if (table.updatedDate) {
+        const updatedDate = table.updatedDate.type === 'date' ? new Date() : new Date().getTime();
+        data[table.updatedDate.column] = updatedDate;
+        columnsSet.add(table.updatedDate.column);
+    }
+    const columns = Array.from(columnsSet);
+    // 构建 sql，逐列处理以支持表达式
+    const fragList = [];
+    const insertValues = [];
+    for (const col of columns) {
+        const { frag, values: vs } = processInsertValue(data[col]);
+        fragList.push(frag);
+        insertValues.push(...vs);
+    }
+    const sql = `insert into ??(${columns.map(() => '??').join(',')}) values(${fragList.join(',')})`;
+    const values = [table.tableName, ...columns, ...insertValues];
+    const res = await (0, utils_1.promiseQuery)(config, connection, sql, values);
+    const packet = res;
+    if (packet.affectedRows !== 1) {
+        throw new exception_1.MysqlException(`Insert failed，table：${table.tableName}，primary key: ${data[table.id]}`);
+    }
+    // 自动生成的id处理
+    if (packet.insertId && (data[table.id] === undefined || data[table.id] === null)) {
+        data[table.id] = packet.insertId;
+    }
+    return data;
+}
+exports.insert = insert;
+/**
+ * 一次插入多条记录
+ * @param connection 连接
+ * @param table 表
+ * @param list 要插入的记录列表
+ */
+async function insertMany(config, connection, table, list) {
+    if (!list.length) {
+        return;
+    }
+    // 列信息，使用 set 防止 columns 中重复配置 id 和更新创建时间列
+    let columnsSet = new Set();
+    // 批量插入必须统一使用 id 或不使用 id，以第一条记录为准
+    if (list[0][table.id]) {
+        columnsSet.add(table.id);
+    }
+    table.columns.forEach(col => columnsSet.add(col));
+    let createdData = undefined;
+    if (table.createdDate) {
+        createdData = table.createdDate.type === 'date' ? new Date() : new Date().getTime();
+        columnsSet.add(table.createdDate.column);
+    }
+    let updatedDate = undefined;
+    if (table.updatedDate) {
+        updatedDate = table.updatedDate.type === 'date' ? new Date() : new Date().getTime();
+        columnsSet.add(table.updatedDate.column);
+    }
+    const columns = Array.from(columnsSet);
+    // 构建 sql
+    let sql = `insert into ??(${columns.map(() => '??').join(',')}) values`;
+    const values = [table.tableName, ...columns];
+    list.forEach((data, idx) => {
+        if (idx > 0) {
+            sql += ',';
+        }
+        const fragList = [];
+        const rowValues = [];
+        if (table.createdDate) {
+            data[table.createdDate.column] = createdData;
+        }
+        if (table.updatedDate) {
+            data[table.updatedDate.column] = updatedDate;
+        }
+        for (const col of columns) {
+            const { frag, values: vs } = processInsertValue(data[col]);
+            fragList.push(frag);
+            rowValues.push(...vs);
+        }
+        sql += `(${fragList.join(',')})`;
+        values.push(...rowValues);
+    });
+    const res = await (0, utils_1.promiseQuery)(config, connection, sql, values);
+    const rsh = res;
+    if (rsh.affectedRows !== list.length) {
+        throw new exception_1.MysqlException(`Insert many for table ${table.tableName} failed,expected to insert ${list.length} records, actually ${rsh.affectedRows}.`);
+    }
+    // insert 插入多条记录是不会返回生成的 id 的，所以就没有办法自动处理
+}
+exports.insertMany = insertMany;

package/dist/mysql/manager/ops/modify.js

@@ -1,10 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.modify = void 0;
-const utils_1 = require("../utils");
-async function modify(config, connection, sql, values) {
-    const res = await (0, utils_1.promiseQuery)(config, connection, sql, values || []);
-    const pck = res;
-    return pck.affectedRows;
-}
-exports.modify = modify;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modify = void 0;
+const utils_1 = require("../utils");
+async function modify(config, connection, sql, values) {
+    const res = await (0, utils_1.promiseQuery)(config, connection, sql, values || []);
+    const pck = res;
+    return pck.affectedRows;
+}
+exports.modify = modify;

package/dist/mysql/manager/ops/order-by.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildOrderBy = void 0;
+/**
+ * 构建 ORDER BY 子句.
+ *
+ * @param orderBy 排序规则
+ * @returns { sql: SQL 片段, values: 参数值数组 }
+ */
+function buildOrderBy(orderBy) {
+    const fragments = [];
+    const values = [];
+    orderBy.forEach((item, idx) => {
+        const prefix = idx === 0 ? ' order by ' : ' , ';
+        if (item.length === 4 && item[0] === 'expr') {
+            const [, exprSql, exprValues, sort] = item;
+            fragments.push(`${prefix}${exprSql} ${sort}`);
+            values.push(...exprValues);
+        }
+        else {
+            const [field, sort] = item;
+            fragments.push(`${prefix}?? ${sort}`);
+            values.push(field);
+        }
+    });
+    return { sql: fragments.join(''), values };
+}
+exports.buildOrderBy = buildOrderBy;

package/dist/mysql/manager/ops/paginate.js

@@ -1,23 +1,48 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.paginate = void 0;
-const count_1 = require("./count");
-const find_1 = require("./find");
-async function paginate(config, conn, opts) {
-    const pn = opts.pn && opts.pn >= 1 ? opts.pn : 1;
-    const limit = opts.pz && opts.pz >= 1 && opts.pz <= 1000 ? opts.pz : 20;
-    const offset = (pn - 1) * limit;
-    const list = await (0, find_1.find)(config, conn, {
-        table: opts.table,
-        criteria: opts.criteria,
-        offset,
-        limit,
-        orderBy: opts.orderBy
-    });
-    const total = await (0, count_1.count)(config, conn, opts.table, opts.criteria);
-    return {
-        total,
-        list
-    };
-}
-exports.paginate = paginate;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.paginateSelect = exports.paginate = void 0;
+const count_1 = require("./count");
+const find_1 = require("./find");
+async function paginate(config, conn, opts) {
+    const pn = opts.pn && opts.pn >= 1 ? opts.pn : 1;
+    const limit = opts.pz && opts.pz >= 1 && opts.pz <= 1000 ? opts.pz : 20;
+    const offset = (pn - 1) * limit;
+    const list = await (0, find_1.find)(config, conn, {
+        table: opts.table,
+        criteria: opts.criteria,
+        offset,
+        limit,
+        orderBy: opts.orderBy
+    });
+    const total = await (0, count_1.count)(config, conn, opts.table, opts.criteria);
+    return {
+        total,
+        list
+    };
+}
+exports.paginate = paginate;
+/**
+ * 指定字段分页查询
+ * @param config
+ * @param conn
+ * @param opts
+ */
+async function paginateSelect(config, conn, opts) {
+    const pn = opts.pn && opts.pn >= 1 ? opts.pn : 1;
+    const limit = opts.pz && opts.pz >= 1 && opts.pz <= 1000 ? opts.pz : 20;
+    const offset = (pn - 1) * limit;
+    const list = await (0, find_1.findSelect)(config, conn, {
+        table: opts.table,
+        criteria: opts.criteria,
+        offset,
+        limit,
+        orderBy: opts.orderBy,
+        select: opts.select
+    });
+    const total = await (0, count_1.count)(config, conn, opts.table, opts.criteria);
+    return {
+        total,
+        list
+    };
+}
+exports.paginateSelect = paginateSelect;

package/dist/mysql/manager/ops/query.js

@@ -1,9 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.query = void 0;
-const utils_1 = require("../utils");
-async function query(config, connection, sql, values) {
-    const res = await (0, utils_1.promiseQuery)(config, connection, sql, values || []);
-    return res;
-}
-exports.query = query;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.query = void 0;
+const utils_1 = require("../utils");
+async function query(config, connection, sql, values) {
+    const res = await (0, utils_1.promiseQuery)(config, connection, sql, values || []);
+    return res;
+}
+exports.query = query;