mm_sqlite 1.4.3 → 1.4.5

package/index.js

@@ -209,7 +209,7 @@ SQLite.prototype.run = async function (sql, params = [], timeout = 30000) {
       });
     });
   } catch (error) {
-    this.log('error', 'SQL执行失败', error);
+    console.error('SQL执行失败', error);
     this.sql = sql;
     this.error = {
       code: error.errno,
@@ -275,7 +275,7 @@ SQLite.prototype.exec = async function (sql, params, timeout) {
       });
     });
   } catch (error) {
-    this.log('error', 'SQL执行失败', error);
+    console.error('SQL执行失败', error);
     this.sql = sql;
     this.error = {
       code: error.errno,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_sqlite",
-    "version": "1.4.3",
+    "version": "1.4.5",
     "description": "高性能SQLite数据库操作模块，提供与mm_mysql完全兼容的API接口，支持异步操作、事务处理和批量操作",
     "main": "index.js",
     "scripts": {
@@ -38,13 +38,13 @@
         "node": ">=14.0.0"
     },
     "dependencies": {
-        "mm_expand": "^2.3.1",
+        "mm_expand": "^2.3.4",
         "sqlite3": "^6.0.1",
         "sqlstring": "^2.3.3"
     },
     "devDependencies": {
-        "eslint": "^10.2.1",
-        "eslint-plugin-jsdoc": "^62.9.0",
+        "eslint": "^10.4.0",
+        "eslint-plugin-jsdoc": "^63.0.0",
         "mm_eslint": "^1.7.1"
     }
 }

package/sql.js

@@ -468,8 +468,8 @@ Sql.prototype.sum = async function (field, query) {
     throw new TypeError('表名未设置');
   }
 
-  const result = await this.groupSum(query, '', field, '');
-  const fieldKey = 'sum_' + field.replace(/`/g, '');
+  let result = await this.groupSum(query, '', field, '');
+  let fieldKey = 'sum_' + field.replace(/`/g, '');
   return result && result.length > 0 ? Number(result[0][fieldKey] || result[0].sum_age) : 0;
 };
 
@@ -488,8 +488,8 @@ Sql.prototype.max = async function (field, query) {
     throw new TypeError('表名未设置');
   }
 
-  const result = await this.groupMath(query, '', field, '', 'MAX');
-  const fieldKey = 'max_' + field.replace(/`/g, '');
+  let result = await this.groupMath(query, '', field, '', 'MAX');
+  let fieldKey = 'max_' + field.replace(/`/g, '');
   return result && result.length > 0 ? Number(result[0][fieldKey] || result[0].max_age) : 0;
 };
 
@@ -508,8 +508,8 @@ Sql.prototype.min = async function (field, query) {
     throw new TypeError('表名未设置');
   }
 
-  const result = await this.groupMath(query, '', field, '', 'MIN');
-  const fieldKey = 'min_' + field.replace(/`/g, '');
+  let result = await this.groupMath(query, '', field, '', 'MIN');
+  let fieldKey = 'min_' + field.replace(/`/g, '');
   return result && result.length > 0 ? Number(result[0][fieldKey] || result[0].min_age) : 0;
 };
 
@@ -528,8 +528,8 @@ Sql.prototype.avg = async function (field, query) {
     throw new TypeError('表名未设置');
   }
 
-  const result = await this.groupMath(query, '', field, '', 'AVG');
-  const fieldKey = 'avg_' + field.replace(/`/g, '');
+  let result = await this.groupMath(query, '', field, '', 'AVG');
+  let fieldKey = 'avg_' + field.replace(/`/g, '');
   return result && result.length > 0 ? Number(result[0][fieldKey] || result[0].avg_age) : 0;
 };
 
@@ -565,7 +565,7 @@ Sql.prototype.backup = async function (file) {
   }
 
   // 获取所有数据
-  const data = await this.getSql('', '', '*');
+  let data = await this.getSql('', '', '*');
 
   if (!data || !Array.isArray(data)) {
     throw new Error('获取数据失败');
@@ -579,18 +579,18 @@ Sql.prototype.backup = async function (file) {
   sqlContent += `-- 备份时间: ${new Date().toISOString()}\n\n`;
 
   // 添加数据插入语句
-  for (const row of data) {
-    const keys = Object.keys(row).map(key => this.escapeId(key)).join(', ');
-    const values = Object.values(row).map(value => this.escape(value)).join(', ');
+  for (let row of data) {
+    let keys = Object.keys(row).map(key => this.escapeId(key)).join(', ');
+    let values = Object.values(row).map(value => this.escape(value)).join(', ');
     sqlContent += `INSERT INTO \`${this.table}\` (${keys}) VALUES (${values});\n`;
   }
 
   // 写入文件（这里需要文件系统模块，实际使用时需要引入 fs）
-  const fs = require('fs');
-  const path = require('path');
+  let fs = require('fs');
+  let path = require('path');
 
   // 确保目录存在
-  const dir = path.dirname(file);
+  let dir = path.dirname(file);
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
@@ -614,7 +614,7 @@ Sql.prototype.restore = async function (file) {
     throw new TypeError('表名未设置');
   }
 
-  const fs = require('fs');
+  let fs = require('fs');
 
   // 检查文件是否存在
   if (!fs.existsSync(file)) {
@@ -622,17 +622,17 @@ Sql.prototype.restore = async function (file) {
   }
 
   // 读取文件内容
-  const sqlContent = fs.readFileSync(file, 'utf8');
+  let sqlContent = fs.readFileSync(file, 'utf8');
 
   if (!sqlContent) {
     throw new Error('备份文件为空');
   }
 
   // 解析 SQL 语句（按分号分割，但需要处理字符串中的分号）
-  const statements = this._parseSqlStatements(sqlContent);
+  let statements = this._parseSqlStatements(sqlContent);
 
   // 执行所有 SQL 语句
-  for (const statement of statements) {
+  for (let statement of statements) {
     if (statement.trim()) {
       // 跳过注释行
       if (!statement.trim().startsWith('--')) {
@@ -651,13 +651,13 @@ Sql.prototype.restore = async function (file) {
  * @private
  */
 Sql.prototype._parseSqlStatements = function (sql) {
-  const statements = [];
+  let statements = [];
   let currentStatement = '';
   let inString = false;
   let stringChar = '';
 
   for (let i = 0; i < sql.length; i++) {
-    const char = sql[i];
+    let char = sql[i];
 
     if (char === "'" || char === '"') {
       if (!inString) {
@@ -745,7 +745,7 @@ Sql.prototype.toWhere = function (obj, like) {
       }
     }
   }
-  return where.replace(' and ', '');
+  return where.replace(/^ and /, '');
 };
 
 /**
@@ -770,7 +770,7 @@ Sql.prototype.toSet = function (obj) {
       set += ',' + escapeId(k) + ' = ' + val;
     }
   }
-  return set.replace(',', '');
+  return set.replace(/^,/, '');
 };
 
 /**
@@ -786,14 +786,14 @@ Sql.prototype.toAddSql = function (item) {
   let key = '';
   let value = '';
 
-  for (const k in item) {
+  for (let k in item) {
     key += ',' + escapeId(k);
     let val = item[k];
     value += ',' + escape(val);
   }
 
   // 使用直接拼接的方式，避免模板替换错误
-  const sql = `INSERT INTO \`${this.table}\` (${key.replace(',', '')}) VALUES (${value.replace(',', '')});`;
+  let sql = `INSERT INTO \`${this.table}\` (${key.replace(',', '')}) VALUES (${value.replace(',', '')});`;
 
   return sql;
 };
@@ -808,10 +808,10 @@ Sql.prototype.toDelSql = function (query, like) {
   if (!this.table) {
     throw new Error('表名未设置');
   }
-  const where = this.toWhere(query, like);
+  let where = this.toWhere(query, like);
 
   // 使用直接拼接的方式，避免模板替换错误
-  const sql = `DELETE FROM \`${this.table}\` WHERE ${where};`;
+  let sql = `DELETE FROM \`${this.table}\` WHERE ${where};`;
 
   return sql;
 };
@@ -827,11 +827,11 @@ Sql.prototype.toSetSql = function (query, item, like) {
   if (!this.table) {
     throw new Error('表名未设置');
   }
-  const where = this.toWhere(query, like);
-  const set = this.toSet(item);
+  let where = this.toWhere(query, like);
+  let set = this.toSet(item);
 
   // 使用直接拼接的方式，避免模板替换错误
-  const sql = `UPDATE \`${this.table}\` SET ${set} WHERE ${where};`;
+  let sql = `UPDATE \`${this.table}\` SET ${set} WHERE ${where};`;
 
   return sql;
 };
@@ -935,29 +935,29 @@ Sql.prototype.addOrSet = async function (where, set, like) {
     where_str = where;
   }
 
-  const count = await this.countSql(where_str);
+  let count = await this.countSql(where_str);
 
   if (count === 0) {
     let key = '';
     let value = '';
 
     if (typeof set === 'string') {
-      const arr = set.split(',');
-      for (const o of arr) {
-        const ar = o.split('=');
+      let arr = set.split(',');
+      for (let o of arr) {
+        let ar = o.split('=');
         if (ar.length === 2) {
           key += ',' + ar[0];
           value += ',' + ar[1];
         }
       }
     } else {
-      for (const k in set) {
+      for (let k in set) {
         key += ',' + this.escapeId(k);
         value += ',' + this.escape(set[k]);
       }
     }
 
-    const bl = await this.addSql(key.replace(',', ''), value.replace(',', ''));
+    let bl = await this.addSql(key.replace(',', ''), value.replace(',', ''));
 
     return bl;
   } else {
@@ -966,7 +966,7 @@ Sql.prototype.addOrSet = async function (where, set, like) {
       set_vals = await this.toSet(set);
     }
 
-    const bl1 = await this.setSql(where_str, set_vals);
+    let bl1 = await this.setSql(where_str, set_vals);
 
     return bl1;
   }
@@ -984,11 +984,11 @@ Sql.prototype.count = async function (query, like, timeout = 30000) {
     throw new Error('表名未设置');
   }
 
-  const where = typeof query === 'string' ? query : await this.toWhere(query, like);
-  const sql = 'SELECT COUNT(*) as num FROM `' + this.table + '`' + (where ? ' WHERE ' + where : '');
+  let where = typeof query === 'string' ? query : await this.toWhere(query, like);
+  let sql = 'SELECT COUNT(*) as num FROM `' + this.table + '`' + (where ? ' WHERE ' + where : '');
   this.sql = sql;
-  const list = await this.run(sql);
-  const total = list && list[0] && list[0].num ? parseInt(list[0].num) : 0;
+  let list = await this.run(sql);
+  let total = list && list[0] && list[0].num ? parseInt(list[0].num) : 0;
 
   return total;
 };
@@ -1023,17 +1023,17 @@ Sql.prototype.addList = async function (list, batch_size = 100, timeout = 60000)
   }
 
   // 分批处理大数据量
-  const total = Math.ceil(list.length / batch_size);
+  let total = Math.ceil(list.length / batch_size);
   this.log('info', `开始分批添加数据，共${total}批，每批${batch_size}条`);
 
   // 分批执行，每批一个单独的批量插入语句
   let final_res = null;
   for (let i = 0; i < total; i++) {
-    const batch = list.slice(i * batch_size, (i + 1) * batch_size);
+    let batch = list.slice(i * batch_size, (i + 1) * batch_size);
     this.log('debug', `处理第${i + 1}/${total}批数据，${batch.length}条`);
 
     // 生成批量插入SQL
-    const batch_sql = this.toBatchAddSql(batch);
+    let batch_sql = this.toBatchAddSql(batch);
     this.sql = batch_sql;
 
     final_res = await this.exec(batch_sql);
@@ -1054,25 +1054,25 @@ Sql.prototype.toBatchAddSql = function (list) {
   }
 
   // 获取第一个对象的键名作为列名
-  const first_obj = list[0];
+  let first_obj = list[0];
   if (!first_obj || typeof first_obj !== 'object') {
     throw new Error('数据格式错误');
   }
 
   let keys = [];
-  for (const k in first_obj) {
+  for (let k in first_obj) {
     keys.push(this.escapeId(k));
   }
 
   // 构建列名部分
-  const columns = keys.join(',');
+  let columns = keys.join(',');
 
   // 构建值部分
-  const values = [];
-  for (const item of list) {
-    const values = [];
-    for (const k of keys) {
-      const key = k.replace(/`/g, '');
+  let values = [];
+  for (let item of list) {
+    let values = [];
+    for (let k of keys) {
+      let key = k.replace(/`/g, '');
       let val = item[key];
       values.push(this.escape(val));
     }
@@ -1080,7 +1080,7 @@ Sql.prototype.toBatchAddSql = function (list) {
   }
 
   // 生成最终SQL
-  const sql = `INSERT INTO \`${this.table}\` (${columns}) VALUES ${values.join(',')}`;
+  let sql = `INSERT INTO \`${this.table}\` (${columns}) VALUES ${values.join(',')}`;
   return sql;
 };
 
@@ -1098,7 +1098,7 @@ Sql.prototype.delList = async function (list, like, batch_size = 100, timeout =
   }
   if (list.length <= batch_size) {
     let sql = '';
-    for (const item of list) {
+    for (let item of list) {
       sql += this.toDelSql(item.query, like);
     }
     this.sql = sql;
@@ -1106,7 +1106,7 @@ Sql.prototype.delList = async function (list, like, batch_size = 100, timeout =
   }
 
   // 分批处理大数据量
-  const total = Math.ceil(list.length / batch_size);
+  let total = Math.ceil(list.length / batch_size);
   this.log('info', `开始分批删除数据，共${total}批，每批${batch_size}条`);
 
   // 使用事务包装整个操作以保证原子性
@@ -1117,11 +1117,11 @@ Sql.prototype.delList = async function (list, like, batch_size = 100, timeout =
 
     // 分批处理
     for (let i = 0; i < total; i++) {
-      const batch = list.slice(i * batch_size, (i + 1) * batch_size);
+      let batch = list.slice(i * batch_size, (i + 1) * batch_size);
       this.log('debug', `处理第${i + 1}/${total}批数据，${batch.length}条`);
 
       let batch_sql = '';
-      for (const item of batch) {
+      for (let item of batch) {
         batch_sql += this.toDelSql(item.query, like);
       }
       final_res = await this.exec(batch_sql, [], timeout);
@@ -1158,7 +1158,7 @@ Sql.prototype.setList = async function (list, like = false, batch_size = 100, ti
   }
   if (list.length <= batch_size) {
     let sql = '';
-    for (const item of list) {
+    for (let item of list) {
       sql += this.toSetSql(item.query, item.obj, like);
     }
     this.sql = sql;
@@ -1166,7 +1166,7 @@ Sql.prototype.setList = async function (list, like = false, batch_size = 100, ti
   }
 
   // 分批处理大数据量
-  const total = Math.ceil(list.length / batch_size);
+  let total = Math.ceil(list.length / batch_size);
   this.log('info', `开始分批更新数据，共${total}批，每批${batch_size}条`);
 
   // 使用事务包装整个操作以保证原子性
@@ -1177,11 +1177,11 @@ Sql.prototype.setList = async function (list, like = false, batch_size = 100, ti
 
     // 分批处理
     for (let i = 0; i < total; i++) {
-      const batch = list.slice(i * batch_size, (i + 1) * batch_size);
+      let batch = list.slice(i * batch_size, (i + 1) * batch_size);
       this.log('debug', `处理第${i + 1}/${total}批数据，${batch.length}条`);
 
       let batch_sql = '';
-      for (const item of batch) {
+      for (let item of batch) {
         batch_sql += this.toSetSql(item.query, item.obj, like);
       }
 
@@ -1274,14 +1274,14 @@ Sql.prototype.tplQuery = function (param_dt, sql_dt) {
             var len = arr.length;
             for (var i = 0; i < len; i++) {
               // 使用直接替换方式，避免模板替换错误
-              const escaped_val = this.escape(arr[i]);
+              let escaped_val = this.escape(arr[i]);
               sl += ' || ' + tpl.replaceAll('{0}', escaped_val.trim("'"));
             }
             sl = sl.replace(' || ', '') + ')';
             sql += ' && ' + sl;
           } else {
             // 使用直接替换方式，避免模板替换错误
-            const escaped_val = this.escape(value);
+            let escaped_val = this.escape(value);
             sql += ' && ' + tpl.replaceAll('{0}', escaped_val.trim("'"));
           }
         } else {
@@ -1358,7 +1358,7 @@ Sql.prototype.tplBody = function (param_dt, sql_dt) {
       var value = this.escape(param_dt[key]);
       if (sql_dt[key]) {
         // 使用直接替换方式，避免模板替换错误
-        const replaced = sql_dt[key].replaceAll('{0}', value.trim("'"));
+        let replaced = sql_dt[key].replaceAll('{0}', value.trim("'"));
         sql += ' , ' + replaced.replace('+ -', '- ').replace('- -', '+ ');
       } else {
         sql += ' , ' + this.escapeId(key) + ' = ' + value;
@@ -1415,15 +1415,15 @@ Sql.prototype.model = function (model) {
  */
 Sql.prototype.getObj = async function (query, sort, view, like, timeout = 30000) {
   // 保存当前分页设置
-  const old_page = this.page;
-  const size = this.size;
+  let old_page = this.page;
+  let size = this.size;
 
   // 设置为只查询一条
   this.page = 1;
   this.size = 1;
 
   // 使用优化后的get方法
-  const list = await this.get(query, sort, view, like, timeout);
+  let list = await this.get(query, sort, view, like, timeout);
 
   // 恢复分页设置
   this.page = old_page;
@@ -1459,22 +1459,22 @@ Sql.prototype.load = async function (file) {
   }
 
   // 读取SQL文件内容
-  const sql_content = await $.file.readText(file);
+  let sql_content = await $.file.readText(file);
 
   if (!sql_content || sql_content.trim() === '') {
     throw new Error(`SQL文件内容为空: ${file}`);
   }
 
   // 分割SQL语句（按分号分割，但需要注意处理字符串中的分号）
-  const sql_stmts = this._splitSqlStatements(sql_content);
+  let sql_stmts = this._splitSqlStatements(sql_content);
 
   // 开始事务执行SQL语句
   await this.exec('BEGIN TRANSACTION');
 
   try {
     // 逐个执行SQL语句
-    for (const sql of sql_stmts) {
-      const trim_sql = sql.trim();
+    for (let sql of sql_stmts) {
+      let trim_sql = sql.trim();
       if (trim_sql) {
         await this.exec(trim_sql);
       }
@@ -1510,15 +1510,15 @@ Sql.prototype.load = async function (file) {
  * @returns {Array} SQL语句数组
  */
 Sql.prototype._splitSqlStatements = function (sql_content) {
-  const stmts = [];
+  let stmts = [];
   let in_str = false;
   let str_char = '';
   let in_cmt = false;
   let cur_stmt = '';
 
   for (let i = 0; i < sql_content.length; i++) {
-    const char = sql_content[i];
-    const next_char = i + 1 < sql_content.length ? sql_content[i + 1] : '';
+    let char = sql_content[i];
+    let next_char = i + 1 < sql_content.length ? sql_content[i + 1] : '';
 
     // 处理注释
     if (!in_str && !in_cmt && char === '-' && next_char === '-') {
@@ -1596,8 +1596,8 @@ Sql.prototype._splitSqlStatements = function (sql_content) {
  */
 Sql.prototype._getCreateTableSql = async function () {
   // 查询表结构信息（SQLite 使用 sqlite_master 表）
-  const sql = `SELECT sql FROM sqlite_master WHERE type='table' AND name='${this.table}'`;
-  const result = await this.run(sql);
+  let sql = `SELECT sql FROM sqlite_master WHERE type='table' AND name='${this.table}'`;
+  let result = await this.run(sql);
 
   if (result && result.length > 0 && result[0].sql) {
     // 在创建表语句中添加 IF NOT EXISTS 条件
@@ -1627,7 +1627,7 @@ Sql.prototype.backup = async function (file, create = false) {
   }
 
   // 获取所有数据
-  const data = await this.getSql('', '', '*');
+  let data = await this.getSql('', '', '*');
 
   if (!data || !Array.isArray(data)) {
     throw new Error('获取数据失败');
@@ -1642,25 +1642,25 @@ Sql.prototype.backup = async function (file, create = false) {
 
   // 如果create为true，添加创建表语句
   if (create) {
-    const create_table_sql = await this._getCreateTableSql();
+    let create_table_sql = await this._getCreateTableSql();
     if (create_table_sql) {
       sql_content += create_table_sql + '\n\n';
     }
   }
 
   // 添加数据插入语句
-  for (const row of data) {
-    const keys = Object.keys(row).map(key => this.escapeId(key)).join(', ');
-    const values = Object.values(row).map(value => this.escape(value)).join(', ');
+  for (let row of data) {
+    let keys = Object.keys(row).map(key => this.escapeId(key)).join(', ');
+    let values = Object.values(row).map(value => this.escape(value)).join(', ');
     sql_content += `INSERT INTO \`${this.table}\` (${keys}) VALUES (${values});\n`;
   }
 
   // 写入文件（这里需要文件系统模块，实际使用时需要引入 fs）
-  const fs = require('fs');
-  const path = require('path');
+  let fs = require('fs');
+  let path = require('path');
 
   // 确保目录存在
-  const dir = path.dirname(file);
+  let dir = path.dirname(file);
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
@@ -1684,20 +1684,20 @@ Sql.prototype.restore = async function (file) {
     throw new TypeError('表名未设置');
   }
 
-  const fs = require('fs');
+  let fs = require('fs');
 
   if (!fs.existsSync(file)) {
     throw new Error('备份文件不存在');
   }
 
   // 读取 SQL 文件
-  const sql_content = fs.readFileSync(file, 'utf8');
+  let sql_content = fs.readFileSync(file, 'utf8');
 
   // 解析 SQL 语句
-  const stmts = this._parseSqlStatements(sql_content);
+  let stmts = this._parseSqlStatements(sql_content);
 
   // 执行每个 SQL 语句
-  for (const stmt of stmts) {
+  for (let stmt of stmts) {
     if (stmt.trim() && !stmt.startsWith('--')) {
       await this.exec(stmt);
     }
@@ -1713,15 +1713,15 @@ Sql.prototype.restore = async function (file) {
  * @private
  */
 Sql.prototype._parseSqlStatements = function (sql) {
-  const stmts = [];
+  let stmts = [];
   let cur_stmt = '';
   let in_str = false;
   let in_cmt = false;
   let quote_char = '';
 
   for (let i = 0; i < sql.length; i++) {
-    const char = sql[i];
-    const next_char = sql[i + 1] || '';
+    let char = sql[i];
+    let next_char = sql[i + 1] || '';
 
     // 处理字符串
     if (!in_cmt && (char === "'" || char === '"') && (i === 0 || sql[i - 1] !== '\\')) {