mm_sqlite 1.3.4 → 1.3.5

package/db.js

@@ -265,7 +265,7 @@ DB.prototype.fields = async function (table, field_name, timeout = 15000) {
     var len = list.length;
     for (var i = 0; i < len; i++) {
       list[i].pk = list[i].pk ? true : false;
-      list[i].notnull = list[i].notnull ? true : false;
+      list[i].not_null = list[i].not_null ? true : false;
     }
     
     // 如果指定了字段名，过滤结果
@@ -273,7 +273,16 @@ DB.prototype.fields = async function (table, field_name, timeout = 15000) {
       list = list.filter(field => field.name === field_name);
     }
     
-    return list;
+    return list.map(item => ({
+      name: item.name,
+      cid: item.cid,
+      default_value: item.dflt_value,
+      not_null: item.notnull,
+      type: item.type,
+      pk: item.pk,
+      auto: item.auto,
+      note: item.note
+    }));
   } catch (err) {
     this.log('error', '获取字段信息失败', err);
     return [];
@@ -611,22 +620,22 @@ DB.prototype.delField = async function (table, field, timeout = 15000) {
 DB.prototype.sqlField = function (fd) {
   var sql = '`{0}`'.replace('{0}', fd.name);
   sql += ' ' + fd.type;
-  if (fd.notnull) {
+  if (fd.not_null) {
     sql += ' NOT NULL';
   }
   if (fd.auto) {
-    if (fd.dflt_value) {
-      if (fd.dflt_value === '0000-00-00 00:00:00') {
-        fd.dflt_value = 'CURRENT_TIMESTAMP';
+    if (fd.default_value) {
+      if (fd.default_value === '0000-00-00 00:00:00') {
+        fd.default_value = 'CURRENT_TIMESTAMP';
       }
-      sql += ' DEFAULT ' + fd.dflt_value;
+      sql += ' DEFAULT ' + fd.default_value;
     }
     sql += ' ' + fd.auto;
-  } else if (fd.dflt_value) {
-    if (fd.dflt_value === '0000-00-00 00:00:00') {
-      fd.dflt_value = '1970-01-01 00:00:00';
+  } else if (fd.default_value) {
+    if (fd.default_value === '0000-00-00 00:00:00') {
+      fd.default_value = '1970-01-01 00:00:00';
     }
-    sql += ' DEFAULT ' + fd.dflt_value;
+    sql += ' DEFAULT ' + fd.default_value;
   }
   if (fd.note) {
     sql += " COMMENT '" + fd.note + "'";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_sqlite",
-    "version": "1.3.4",
+    "version": "1.3.5",
     "description": "高性能SQLite数据库操作模块，提供与mm_mysql完全兼容的API接口，支持异步操作、事务处理和批量操作",
     "main": "index.js",
     "scripts": {

package/sql.js

@@ -1110,13 +1110,13 @@ Sql.prototype.addList = async function (list, batch_size = 100, timeout = 60000)
 
         // 分批处理大数据量
         const total = Math.ceil(list.length / batch_size);
-        $.log.info(`开始分批添加数据，共${total}批，每批${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);
-          $.log.debug(`处理第${i + 1}/${total}批数据，${batch.length}条`);
+          this.log('debug', `处理第${i + 1}/${total}批数据，${batch.length}条`);
 
           // 生成批量插入SQL
           const batch_sql = this.toBatchAddSql(batch);
@@ -1131,7 +1131,7 @@ Sql.prototype.addList = async function (list, batch_size = 100, timeout = 60000)
           ]);
         }
 
-        $.log.success(`批量添加数据完成，共${list.length}条`);
+        this.log('success', `批量添加数据完成，共${list.length}条`);
         return final_res;
       })(),
       timeout_promise
@@ -1216,7 +1216,7 @@ Sql.prototype.delList = async function (list, like, batch_size = 100, timeout =
 
         // 分批处理大数据量
         const total = Math.ceil(list.length / batch_size);
-        $.log.info(`开始分批删除数据，共${total}批，每批${batch_size}条`);
+        this.log('info', `开始分批删除数据，共${total}批，每批${batch_size}条`);
 
         // 使用事务包装整个操作以保证原子性
         let final_res = null;
@@ -1227,7 +1227,7 @@ 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);
-            $.log.debug(`处理第${i + 1}/${total}批数据，${batch.length}条`);
+            this.log('debug', `处理第${i + 1}/${total}批数据，${batch.length}条`);
 
             let batch_sql = '';
             for (const item of batch) {
@@ -1257,7 +1257,7 @@ Sql.prototype.delList = async function (list, like, batch_size = 100, timeout =
           this.log('error', 'SQL语句执行失败', error);
         }
 
-        $.log.success(`批量删除数据完成，共${list.length}条`);
+        this.log('success', `批量删除数据完成，共${list.length}条`);
         return final_res;
       })(),
       timeout_promise
@@ -1300,7 +1300,7 @@ Sql.prototype.setList = async function (list, like = false, batch_size = 100, ti
 
         // 分批处理大数据量
         const total = Math.ceil(list.length / batch_size);
-        $.log.info(`开始分批更新数据，共${total}批，每批${batch_size}条`);
+        this.log('info', `开始分批更新数据，共${total}批，每批${batch_size}条`);
 
         // 使用事务包装整个操作以保证原子性
         let final_res = null;
@@ -1311,7 +1311,7 @@ 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);
-            $.log.debug(`处理第${i + 1}/${total}批数据，${batch.length}条`);
+            this.log('debug', `处理第${i + 1}/${total}批数据，${batch.length}条`);
 
             let batch_sql = '';
             for (const item of batch) {
@@ -1339,7 +1339,7 @@ Sql.prototype.setList = async function (list, like = false, batch_size = 100, ti
           }
         }
 
-        $.log.success(`批量更新数据完成，共${list.length}条`);
+        this.log('success', `批量更新数据完成，共${list.length}条`);
         return final_res;
       })(),
       timeout_promise