mm_mysql 2.4.4 → 2.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_mysql",
-	"version": "2.4.4",
+	"version": "2.4.5",
 	"description": "这是超级美眉mysql帮助函数模块，用于便捷操作mysql，使用await方式，可以避免嵌套函数",
 	"main": "index.js",
 	"dependencies": {

package/sql.js

@@ -203,7 +203,7 @@ Sql.prototype.toQuery = function (where, sort, view) {
   }
   if (this.size && this.page) {
     var start = this.size * (this.page - 1);
-    sql += ' limit ' + start + ',' + this.size;
+    sql += ' limit ' + start + ', ' + this.size;
   }
   return sql;
 };
@@ -307,11 +307,11 @@ Sql.prototype.groupMathSql = async function (where, groupby, view, sort, method)
     var arr = view_val.split(',');
     for (var i = 0; i < arr.length; i++) {
       var str = escapeId(arr[i]);
-      view_str += ',' + method.toUpperCase() + '(' + str + ') ' + method.toLowerCase() + '_' + str.replace(
+      view_str += ', ' + method.toUpperCase() + '(' + str + ') ' + method.toLowerCase() + '_' + str.replace(
         /`/g, '');
     }
   } else {
-    view_str = ',' + method.toUpperCase() + '(' + escapeId(view_val) + ') ' + method.toLowerCase() + '_' +
+    view_str = ', ' + method.toUpperCase() + '(' + escapeId(view_val) + ') ' + method.toLowerCase() + '_' +
       view_val.replace(/`/g, '');
   }
   var sql = 'SELECT ' + (groupby ? escapeId(groupby) : '') + view_str + ' FROM `' + this.table + '`';
@@ -326,7 +326,7 @@ Sql.prototype.groupMathSql = async function (where, groupby, view, sort, method)
   }
   if (this.size && this.page) {
     var start = this.size * (this.page - 1);
-    sql += ' limit ' + start + ',' + this.size;
+    sql += ' limit ' + start + ', ' + this.size;
   }
   return await this.run(sql);
 };
@@ -462,7 +462,7 @@ Sql.prototype._buildLikeWhere = function (obj) {
       where += ' and ' + escapeId(k) + ' = ' + val;
     }
   }
-  return where;
+  return where.replace(/^ and /, '');
 };
 
 Sql.prototype._buildExactWhere = function (obj) {
@@ -488,7 +488,7 @@ Sql.prototype._buildExactWhere = function (obj) {
       where += ' and ' + escapeId(k) + ' = ' + val;
     }
   }
-  return where;
+  return where.replace(/^ and /, '');
 };
 
 /**
@@ -508,16 +508,16 @@ Sql.prototype.toSet = function (obj) {
 
     if (k.endsWith('_add')) {
       let k2 = escapeId(k.replace('_add', ''));
-      set += ',' + k2 + ' = ' + k2 + ' + ' + val;
+      set += ', ' + k2 + ' = ' + k2 + ' + ' + val;
     } else if (k.endsWith('_del')) {
       let 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(/^, /, '');
 };
 
 /**
@@ -534,12 +534,12 @@ Sql.prototype.toAddSql = function (item) {
   let value = '';
 
   for (let k in item) {
-    key += ',' + escapeId(k);
-    value += ',' + escape(item[k]);
+    key += ', ' + escapeId(k);
+    value += ', ' + escape(item[k]);
   }
 
   // 使用直接拼接的方式，避免模板替换错误
-  let sql = `INSERT INTO \`${this.table}\` (${key.replace(',', '')}) VALUES (${value.replace(',', '')});`;
+  let sql = `INSERT INTO \`${this.table}\` (${key.replace(', ', '')}) VALUES (${value.replace(/^, /, '')});`;
 
   return sql;
 };
@@ -693,21 +693,21 @@ Sql.prototype._parseSetData = async function (set) {
     for (let o of arr) {
       let ar = o.split('=');
       if (ar.length === 2) {
-        key_str += ',' + ar[0];
-        val_str += ',' + ar[1];
+        key_str += ', ' + ar[0];
+        val_str += ', ' + ar[1];
       }
     }
   } else {
     for (let k in set) {
-      key_str += ',' + escapeId(k);
+      key_str += ', ' + escapeId(k);
       let val = set[k];
-      val_str += ',' + escape(val);
+      val_str += ', ' + escape(val);
     }
   }
 
   return {
-    key_str: key_str.replace(',', ''),
-    val_str: val_str.replace(',', '')
+    key_str: key_str.replace(/^, /, ''),
+    val_str: val_str.replace(/^, /, '')
   };
 };
 
@@ -1180,7 +1180,7 @@ Sql.prototype.tplBody = function (param_dt, sql_dt) {
   let parts = [];
   if (!sql_dt || Object.keys(sql_dt).length === 0) {
     for (let key in param_dt) {
-      parts.push(' ' + escapeId(key) + ' = ' + escape(param_dt[key]));
+      parts.push(', ' + escapeId(key) + ' = ' + escape(param_dt[key]));
     }
   } else {
     for (let key in param_dt) {
@@ -1188,13 +1188,13 @@ Sql.prototype.tplBody = function (param_dt, sql_dt) {
       if (sql_dt[key]) {
         // 使用直接替换方式，避免模板替换错误
         let replaced = sql_dt[key].replaceAll('{0}', value.trim("'"));
-        parts.push(' ' + replaced.replace(/\+ -/g, '- ').replace(/- -/g, '+ '));
+        parts.push(', ' + replaced.replace(/\+ -/g, '- ').replace(/- -/g, '+ '));
       } else {
-        parts.push(' ' + escapeId(key) + ' = ' + value);
+        parts.push(', ' + escapeId(key) + ' = ' + value);
       }
     }
   }
-  return parts.join(',').replace(', ', '');
+  return parts.join(',').replace(/^, /, '');
 };
 
 /**
@@ -1593,22 +1593,22 @@ Sql.prototype.backup = async function (file, create = false) {
   }
 
   // 构建 SQL 语句
-  let sqlContent = '';
+  let sql_content = '';
 
   // 添加表结构（简化版，实际应用中可能需要更复杂的表结构导出）
-  sqlContent += `-- 备份表: ${this.table}\n`;
-  sqlContent += `-- 备份时间: ${new Date().toISOString()}\n\n`;
+  sql_content += `-- 备份表: ${this.table}\n`;
+  sql_content += `-- 备份时间: ${new Date().toISOString()}\n\n`;
 
   // 如果create为true，添加创建表语句
   if (create) {
     let createTableSql = await this._getCreateTableSql();
     if (createTableSql) {
-      sqlContent += createTableSql + '\n\n';
+      sql_content += createTableSql + '\n\n';
 
       // 添加表注释信息
       let commentSql = await this._getTableComments();
       if (commentSql) {
-        sqlContent += commentSql + '\n';
+        sql_content += commentSql + '\n';
       }
     }
   }
@@ -1617,7 +1617,7 @@ Sql.prototype.backup = async function (file, create = false) {
   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`;
+    sql_content += `INSERT INTO \`${this.table}\` (${keys}) VALUES (${values});\n`;
   }
 
   // 写入文件（这里需要文件系统模块，实际使用时需要引入 fs）