mm_sql 1.4.3 → 1.4.5

package/admin_vs_direct_test.js

@@ -2,10 +2,10 @@ const { mysqlAdmin } = require('../mm_mysql');
 
 /**
  * 测试run方法对不存在的表的处理
- * @param {Object} admin_mysql - mysqlAdmin实例
- * @param {Object} direct_mysql - 直接Mysql实例
+ * @param {object} admin_mysql - mysqlAdmin实例
+ * @param {object} direct_mysql - 直接Mysql实例
  */
-async function testRunMethod(admin_mysql, direct_mysql) {
+async function runMethod(admin_mysql, direct_mysql) {
   console.log('\n测试1: 比较对不存在的表的处理...');
   
   // mysqlAdmin实例测试
@@ -29,10 +29,10 @@ async function testRunMethod(admin_mysql, direct_mysql) {
 
 /**
  * 比较实例类型和属性
- * @param {Object} admin_mysql - mysqlAdmin实例
- * @param {Object} direct_mysql - 直接Mysql实例
+ * @param {object} admin_mysql - mysqlAdmin实例
+ * @param {object} direct_mysql - 直接Mysql实例
  */
-function compareInstanceType(admin_mysql, direct_mysql) {
+function instanceType(admin_mysql, direct_mysql) {
   console.log('\n测试2: 比较实例类型和属性...');
   console.log('mysqlAdmin实例类型:', admin_mysql.constructor.name);
   console.log('直接Mysql实例类型:', direct_mysql.constructor.name);
@@ -42,10 +42,10 @@ function compareInstanceType(admin_mysql, direct_mysql) {
 
 /**
  * 检查缓存问题
- * @param {Object} config - 数据库配置
- * @param {Object} admin_mysql - mysqlAdmin实例
+ * @param {object} config - 数据库配置
+ * @param {object} admin_mysql - mysqlAdmin实例
  */
-async function checkCache(config, admin_mysql) {
+async function cache(config, admin_mysql) {
   console.log('\n测试3: 检查缓存问题...');
   const admin_mysql2 = mysqlAdmin('compare_test', config); // 相同scope
   const admin_mysql3 = mysqlAdmin('compare_test2', config); // 不同scope
@@ -87,9 +87,9 @@ async function compareAdminDirect() {
     const direct_mysql = new Mysql(config);
     console.log('✅ 直接Mysql实例创建成功');
     
-    await testRunMethod(admin_mysql, direct_mysql);
-    compareInstanceType(admin_mysql, direct_mysql);
-    await checkCache(config, admin_mysql);
+    await runMethod(admin_mysql, direct_mysql);
+    instanceType(admin_mysql, direct_mysql);
+    await cache(config, admin_mysql);
     
   } catch (error) {
     console.log('❌ 实例创建失败:', error.message);
@@ -99,7 +99,7 @@ async function compareAdminDirect() {
 /**
  * 测试mm_sql模块中的适配器行为
  */
-async function checkSqlAdapter() {
+async function sqlAdapter() {
   console.log('\n=== 测试mm_sql模块中的适配器行为 ===');
   
   try {
@@ -151,7 +151,7 @@ async function main() {
   console.log('开始比较mysqlAdmin和直接Mysql实例的行为...\n');
   
   await compareAdminDirect();
-  await checkSqlAdapter();
+  await sqlAdapter();
   
   console.log('\n比较测试完成');
 }

package/debug_error_test.js

@@ -2,9 +2,9 @@ const { Sql } = require('./index.js');
 
 /**
  * 测试适配器直接调用
- * @param {Object} mysql_sql - MySQL实例
+ * @param {object} mysql_sql - MySQL实例
  */
-async function testAdapterDirect(mysql_sql) {
+async function adapterDirect(mysql_sql) {
   console.log('\n测试1: 直接调用适配器run方法...');
   try {
     await mysql_sql._adapter.run('SELECT * FROM non_existent_table_xyz');
@@ -16,9 +16,9 @@ async function testAdapterDirect(mysql_sql) {
 
 /**
  * 测试mm_sql的run方法调用
- * @param {Object} mysql_sql - MySQL实例
+ * @param {object} mysql_sql - MySQL实例
  */
-async function testSqlRun(mysql_sql) {
+async function sqlRun(mysql_sql) {
   console.log('\n测试2: 通过mm_sql的run方法调用...');
   try {
     await mysql_sql.run('SELECT * FROM non_existent_table_xyz');
@@ -30,9 +30,9 @@ async function testSqlRun(mysql_sql) {
 
 /**
  * 测试参数验证
- * @param {Object} mysql_sql - MySQL实例
+ * @param {object} mysql_sql - MySQL实例
  */
-async function testParamValid(mysql_sql) {
+async function paramValid(mysql_sql) {
   console.log('\n测试3: 测试参数验证...');
   try {
     await mysql_sql.run(123); // 无效参数类型
@@ -66,9 +66,9 @@ async function debugMysqlError() {
     console.log('✅ mm_sql MySQL实例创建成功');
     console.log('适配器类型:', mysql_sql._adapter?.constructor?.name);
     
-    await testAdapterDirect(mysql_sql);
-    await testSqlRun(mysql_sql);
-    await testParamValid(mysql_sql);
+    await adapterDirect(mysql_sql);
+    await sqlRun(mysql_sql);
+    await paramValid(mysql_sql);
     
   } catch (error) {
     console.log('❌ mm_sql实例创建失败:', error.message);
@@ -77,9 +77,9 @@ async function debugMysqlError() {
 
 /**
  * 测试SQLite适配器直接调用
- * @param {Object} sqlite_sql - SQLite实例
+ * @param {object} sqlite_sql - SQLite实例
  */
-async function testSqliteAdapter(sqlite_sql) {
+async function sqliteAdapter(sqlite_sql) {
   console.log('\n测试1: 直接调用适配器run方法...');
   try {
     await sqlite_sql._adapter.run('SELECT * FROM non_existent_table_xyz');
@@ -91,9 +91,9 @@ async function testSqliteAdapter(sqlite_sql) {
 
 /**
  * 测试SQLite的run方法调用
- * @param {Object} sqlite_sql - SQLite实例
+ * @param {object} sqlite_sql - SQLite实例
  */
-async function testSqliteRun(sqlite_sql) {
+async function sqliteRun(sqlite_sql) {
   console.log('\n测试2: 通过mm_sql的run方法调用...');
   try {
     await sqlite_sql.run('SELECT * FROM non_existent_table_xyz');
@@ -105,9 +105,9 @@ async function testSqliteRun(sqlite_sql) {
 
 /**
  * 测试SQLite参数验证
- * @param {Object} sqlite_sql - SQLite实例
+ * @param {object} sqlite_sql - SQLite实例
  */
-async function testSqliteParam(sqlite_sql) {
+async function sqliteParam(sqlite_sql) {
   console.log('\n测试3: 测试参数验证...');
   try {
     await sqlite_sql.run(123); // 无效参数类型

package/index.js

@@ -1,9 +1,4 @@
-/**
- * SQL通用类
- * @author <a href="http://qww.elins.cn">qww</a>
- * @version 1.0
- */
-
+require('mm_expand');
 /**
  * 数据库SQL类
  * @class
@@ -19,12 +14,35 @@ class Sql {
     /**
      * 配置信息
      */
-    this.config = {scope: 'sys',
-      db_type: 'mysql',
+    this.config = {
+      scope: 'sys',
+      way: 'mysql',
+      sqlite: {
+        dir: './db/'.fullname(),
+        user: 'root',
+        password: '',
+        database: 'mm',
+        charset: 'utf8mb4',
+        connect_timeout: 20000,
+        connection_limit: 500
+      },
+      mysql: {
+        host: '127.0.0.1',
+        port: 3306,
+        user: 'root',
+        password: 'Asd159357',
+        database: '',
+        charset: 'utf8mb4',
+        timezone: '+08:00',
+        connect_timeout: 20000,
+        connection_limit: 500
+      },
+
       dir: '/db/',
       host: 'localhost',
       port: 3306,
-      database: '', ...config || {}};
+      database: '', ...config || {}
+    };
 
     /**
      * SQL适配器
@@ -49,25 +67,25 @@ Sql.prototype._init = function () {
  * @private
  */
 Sql.prototype._createSqlAdapter = function () {
-  const adapter_mod = `mm_${this.config.db_type}`;
+  const adapter_mod = `mm_${this.config.way}`;
   const adapter = require(adapter_mod);
 
   // 根据数据库类型选择不同的初始化方式
-  if (this.config.db_type === 'mysql') {
+  if (this.config.way === 'mysql') {
     // 创建MySQL实例
     const admin = adapter.mysqlAdmin;
-    this._adapter = admin(this.config.scope, this.config);
-  } else if (this.config.db_type === 'sqlite') {
+    this._adapter = admin(this.config.scope, this.config[this.config.way]);
+  } else if (this.config.way === 'sqlite') {
     // SQLite应该有类似的结构
     const admin = adapter.sqliteAdmin;
-    this._adapter = admin(this.config.scope, this.config);
+    this._adapter = admin(this.config.scope, this.config[this.config.way]);
   } else {
     // 其他数据库类型直接使用Sql类（如果存在）
     const adapter_cls = adapter.Sql;
     if (adapter_cls) {
-      this._adapter = new adapter_cls(this.config);
+      this._adapter = new adapter_cls(this.config[this.config.way]);
     } else {
-      throw new Error(`不支持的数据库类型: ${this.config.db_type}`);
+      throw new Error(`不支持的数据库类型: ${this.config.way}`);
     }
   }
 };
@@ -101,7 +119,7 @@ Sql.prototype._validateSqlParams = function (sql, param, timeout) {
  */
 Sql.prototype.run = function (sql, param = [], timeout = null) {
   this._validateSqlParams(sql, param, timeout);
-    
+
   try {
     // 支持两种调用方式：run(sql, param, timeout) 或 run({sql: '', param: []})
     let final_sql = sql;
@@ -129,7 +147,7 @@ Sql.prototype.run = function (sql, param = [], timeout = null) {
  */
 Sql.prototype.exec = function (sql, param = [], timeout = null) {
   this._validateSqlParams(sql, param, timeout);
-    
+
   try {
     // 支持两种调用方式：exec(sql, param, timeout) 或 exec({sql: '', param: []})
     let final_sql = sql;
@@ -182,7 +200,7 @@ Sql.prototype.setConfig = function (config) {
   if (!config || typeof config !== 'object') {
     throw new TypeError('config must be object');
   }
-    
+
   try {
     this.config = Object.assign(this.config, config);
     this._init();
@@ -203,13 +221,13 @@ Sql.prototype.tplQuery = function (param, sql_tpl) {
   if (!param || typeof param !== 'object') {
     throw new TypeError('param must be object');
   }
-  
+
   // 如果sql_tpl为null或undefined，使用空对象
   const template = sql_tpl || {};
-  
+
   try {
     const segments = [];
-        
+
     for (const key in param) {
       if (template[key]) {
         // 替换占位符{0}为参数值
@@ -220,7 +238,7 @@ Sql.prototype.tplQuery = function (param, sql_tpl) {
         segments.push('`' + key + "` = '" + param[key] + "'");
       }
     }
-        
+
     return segments.join(' AND ');
   } catch (error) {
     this.log('error', '模板查询生成失败', error);
@@ -240,13 +258,13 @@ Sql.prototype.tplBody = function (param, sql_tpl) {
   if (!param || typeof param !== 'object') {
     throw new TypeError('param must be object');
   }
-  
+
   // 如果sql_tpl为null或undefined，使用空对象
   const template = sql_tpl || {};
-    
+
   try {
     const segments = [];
-                
+
     for (const key in param) {
       if (template[key]) {
         // 替换占位符{0}为参数值
@@ -257,7 +275,7 @@ Sql.prototype.tplBody = function (param, sql_tpl) {
         segments.push('`' + key + "` = '" + param[key] + "'");
       }
     }
-        
+
     return segments.join(' , ');
   } catch (error) {
     this.log('error', '模板数据生成失败', error);
@@ -280,7 +298,7 @@ Sql.prototype.filter = function (param, arr) {
   if (!Array.isArray(arr)) {
     throw new TypeError('arr must be array');
   }
-    
+
   try {
     const result = {};
     for (const key of arr) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_sql",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "description": "一个通用的SQL帮助类，支持通过切换db_type实现对不同数据库的操作，包括MySQL和SQLite等",
   "main": "index.js",
   "scripts": {
@@ -44,12 +44,12 @@
     "node": ">=12.0.0"
   },
   "dependencies": {
-    "mm_mysql": "^2.2.7",
-    "mm_sqlite": "^1.2.7"
+    "mm_mysql": "^2.2.9",
+    "mm_sqlite": "^1.2.9"
   },
   "devDependencies": {
     "eslint": "^9.39.2",
-    "eslint-plugin-jsdoc": "^61.5.0",
-    "mm_eslint": "^1.1.1"
+    "eslint-plugin-jsdoc": "^62.5.0",
+    "mm_eslint": "^1.6.8"
   }
 }

package/test.js

@@ -21,11 +21,21 @@ class SqlTest {
       this.sql = new Sql({
         // db_type: 'mysql',
         db_type: 'sqlite',
-        dir: './db',
-        host: 'localhost',
-        user: 'root',
-        password: 'Asd159357',
-        database: 'mm'
+        sqlite: {
+          dir: './db',
+          user: 'root',
+          password: '',
+          database: 'mm',
+          charset: 'utf8mb4',
+          connect_timeout: 20000,
+          connection_limit: 500
+        },
+        mysql: {
+          host: 'localhost',
+          user: 'root',
+          password: 'Asd159357',
+          database: 'mm'
+        }
       });
       console.log('初始化测试成功');
       return true;