mm_sqlite 1.4.4 → 1.4.6

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.4",
+    "version": "1.4.6",
     "description": "高性能SQLite数据库操作模块，提供与mm_mysql完全兼容的API接口，支持异步操作、事务处理和批量操作",
     "main": "index.js",
     "scripts": {

package/sql.js

@@ -275,11 +275,11 @@ Sql.prototype.addOrSetSql = async function (where, set) {
       var o = arr[i];
       var ar = o.split('=');
       if (ar.length === 2) {
-        key += ',' + ar[0];
-        value += ',' + ar[1];
+        key += ', ' + ar[0];
+        value += ', ' + ar[1];
       }
     }
-    return await this.addSql(key.replace(',', ''), value.replace(',', ''));
+    return await this.addSql(key.replace(/^, /, ''), value.replace(/^, /, ''));
   }
   return await this.setSql(where, set);
 };
@@ -745,7 +745,7 @@ Sql.prototype.toWhere = function (obj, like) {
       }
     }
   }
-  return where.replace(' and ', '');
+  return where.replace(/^ and /, '');
 };
 
 /**
@@ -762,15 +762,15 @@ Sql.prototype.toSet = function (obj) {
 
     if (k.endsWith('_add')) {
       var k2 = escapeId(k.replace('_add', ''));
-      set += ',' + k2 + ' = ' + k2 + ' + ' + val;
+      set += ', ' + k2 + ' = ' + k2 + ' + ' + val;
     } else if (k.endsWith('_del')) {
       var k3 = escapeId(k.replace('_del', ''));
-      set += ',' + k3 + ' = ' + k3 + ' - ' + val;
+      set += ', ' + k3 + ' = ' + k3 + ' - ' + val;
     } else {
-      set += ',' + escapeId(k) + ' = ' + val;
+      set += ', ' + escapeId(k) + ' = ' + val;
     }
   }
-  return set.replace(',', '');
+  return set.replace(/^, /, '');
 };
 
 /**
@@ -787,13 +787,13 @@ Sql.prototype.toAddSql = function (item) {
   let value = '';
 
   for (let k in item) {
-    key += ',' + escapeId(k);
+    key += ', ' + escapeId(k);
     let val = item[k];
-    value += ',' + escape(val);
+    value += ', ' + escape(val);
   }
 
   // 使用直接拼接的方式，避免模板替换错误
-  let sql = `INSERT INTO \`${this.table}\` (${key.replace(',', '')}) VALUES (${value.replace(',', '')});`;
+  let sql = `INSERT INTO \`${this.table}\` (${key.replace(/^, /, '')}) VALUES (${value.replace(/^, /, '')});`;
 
   return sql;
 };
@@ -946,18 +946,18 @@ Sql.prototype.addOrSet = async function (where, set, like) {
       for (let o of arr) {
         let ar = o.split('=');
         if (ar.length === 2) {
-          key += ',' + ar[0];
-          value += ',' + ar[1];
+          key += ', ' + ar[0];
+          value += ', ' + ar[1];
         }
       }
     } else {
       for (let k in set) {
-        key += ',' + this.escapeId(k);
-        value += ',' + this.escape(set[k]);
+        key += ', ' + this.escapeId(k);
+        value += ', ' + this.escape(set[k]);
       }
     }
 
-    let bl = await this.addSql(key.replace(',', ''), value.replace(',', ''));
+    let bl = await this.addSql(key.replace(/^, /, ''), value.replace(/^, /, ''));
 
     return bl;
   } else {
@@ -1338,7 +1338,7 @@ Sql.prototype.tplQuery = function (param_dt, sql_dt) {
       }
     }
   }
-  return sql.replace(' && ', '');
+  return sql.replace(/^ && /, '');
 };
 
 /**
@@ -1351,7 +1351,7 @@ Sql.prototype.tplBody = function (param_dt, sql_dt) {
   var sql = '';
   if (!sql_dt || sql_dt.length === 0) {
     for (var key in param_dt) {
-      sql += ' , ' + this.escapeId(key) + ' = ' + this.escape(val[key]);
+      sql += ', ' + this.escapeId(key) + ' = ' + this.escape(val[key]);
     }
   } else {
     for (var key in param_dt) {
@@ -1359,13 +1359,13 @@ Sql.prototype.tplBody = function (param_dt, sql_dt) {
       if (sql_dt[key]) {
         // 使用直接替换方式，避免模板替换错误
         let replaced = sql_dt[key].replaceAll('{0}', value.trim("'"));
-        sql += ' , ' + replaced.replace('+ -', '- ').replace('- -', '+ ');
+        sql += ', ' + replaced.replace('+ -', '- ').replace('- -', '+ ');
       } else {
-        sql += ' , ' + this.escapeId(key) + ' = ' + value;
+        sql += ', ' + this.escapeId(key) + ' = ' + value;
       }
     }
   }
-  return sql.replace(' , ', '');
+  return sql.replace(/^, /, '');
 };
 
 /**