mm_dao 1.8.1 → 1.8.3

package/lib/dao.js

@@ -2,6 +2,7 @@ const path = require('path');
 const Item = require('mm_machine').Mod;
 const { string, array, date, file } = require('mm_helper');
 const { getRet } = require('mm_ret');
+const dbAdmin = require('mm_dbs');
 
 /**
  * Sql操作驱动类
@@ -166,9 +167,6 @@ Dao.prototype._getInject = function (key) {
   if (value !== undefined && value !== null && value !== '') {
     return value;
   }
-  if (this.parent && this.parent.config) {
-    return this.parent.config[key];
-  }
   return undefined;
 };
 
@@ -718,14 +716,7 @@ Dao.prototype.getParam = async function (db, field) {
  */
 Dao.prototype._getFieldsFromCache = function (cg) {
   var lt = [];
-  // 方案B：db 池改为可选注入（config.get_db_pool 返回等价数据库池注册表），未配置则跳过缓存读取
-  var get_db_pool = this._getInject('get_db_pool');
-  var db_pool = typeof get_db_pool === 'function' ? get_db_pool() : null;
-  if (!db_pool) {
-    this.log('warn', '未配置 get_db_pool，跳过字段缓存读取');
-    return lt;
-  }
-  var pool = db_pool['sys'];
+  var pool = dbAdmin('os');
   if (pool) {
     var dt = pool.get(cg.table);
     if (dt && dt.config) {
@@ -1161,17 +1152,26 @@ Dao.prototype.main = async function (params, db) {
     var safe_table = typeof table === 'string' && string.validate(table, 'username') ? table : '';
 
     // 设置操作的数据表
+    var table_name;
     if (string.has(cg.table, '*{0}*')) {
       if (table) {
         if (!safe_table) {
           return getRet().error(30001, '表名包含无效字符');
         }
-        db.table = cg.table.replace('{0}', safe_table);
+        table_name = cg.table.replace('{0}', safe_table);
       } else {
         return getRet().error(30001, '表名不能为空');
       }
     } else {
-      db.table = cg.table + '';
+      table_name = cg.table + '';
+    }
+    db.table = table_name;
+
+    // 兼容传入数据管理器（无 config，只有 new/getSql 等方法）的场景：
+    // 派生一张绑定表名的表模型，使 getSql/getCountSql/groupCountSql 等
+    // 表级方法与 config.filter 可用；传入的已是表模型时保持不变
+    if (db && db.config === undefined && typeof db.new === 'function') {
+      db = db.new(table_name, cg.key);
     }
 
     return await this[method](db, qy, { ...body });

package/lib/manager.js

@@ -39,11 +39,6 @@ class DaoManager extends Manager {
       user_id: "user_id",
       token: "x-auth-token",
     },
-    /**
-     * 数据库池获取函数（可选注入，返回数据库池注册表；未配置则驱动跳过字段缓存）
-     * @type {Function|null}
-     */
-    get_db_pool: null,
     /**
      * 用户路径（导出目录优先，替代原全局 config 的 user_path）
      * @type {string}
@@ -115,7 +110,6 @@ DaoManager.prototype.add = function (config) {
   var drive = new this.Drive(
     {
       dict: this.config.dict,
-      get_db_pool: this.config.get_db_pool,
       user_path: this.config.user_path,
       static_path: this.config.static_path,
       run_path: this.config.run_path,

package/package.json

@@ -1,64 +1,65 @@
-{
-  "name": "mm_dao",
-  "version": "1.8.1",
-  "description": "一个通用的SQL帮助类，支持通过切换db_type实现对不同数据库的操作，包括MySQL和SQLite等；另提供 manager.js/drive.js 的SQL模板管理器（融合自 mm_os com/sql，基于 mm_corejs，内置管理器池，无全局/原型扩展依赖）",
-  "main": "index.js",
-  "scripts": {
-    "start": "node tests/test.js",
-    "test": "node tests/test.js",
-    "lint": "eslint . --config eslint.config.js",
-    "lint:fix": "eslint . --config eslint.config.js --fix",
-    "lint:check": "eslint . --config eslint.config.js --max-warnings 0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://gitee.com/qiuwenwu91/mm_dao.git"
-  },
-  "keywords": [
-    "mm_mod",
-    "mm_infra",
-    "mm_runtime",
-    "sql",
-    "mysql",
-    "sql server",
-    "sqlite",
-    "database",
-    "async",
-    "await",
-    "promise",
-    "add",
-    "del",
-    "set",
-    "get",
-    "query",
-    "run",
-    "exec",
-    "orm",
-    "多数据库",
-    "database-adapter"
-  ],
-  "layer": "port",
-  "group": "repo",
-  "author": "邱文武",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://gitee.com/qiuwenwu91/mm_dao/issues"
-  },
-  "homepage": "https://gitee.com/qiuwenwu91/mm_dao#readme",
-  "engines": {
-    "node": ">=12.0.0"
-  },
-  "dependencies": {
-    "mm_corejs": "^1.1.4",
-    "mm_machine": "^3.5.4",
-    "mm_helper": "^1.0.0",
-    "mm_excel": "^1.2.4",
-    "mm_ret": "^1.4.8",
-    "mm_sql": "^1.8.0"
-  },
-  "devDependencies": {
-    "eslint": "^10.9.1",
-    "eslint-plugin-jsdoc": "^64.2.1",
-    "mm_eslint": "^1.7.7"
-  }
-}
+{
+    "name": "mm_dao",
+    "version": "1.8.3",
+    "description": "一个通用的SQL帮助类，支持通过切换db_type实现对不同数据库的操作，包括MySQL和SQLite等；另提供 manager.js/drive.js 的SQL模板管理器（融合自 mm_os com/sql，基于 mm_corejs，内置管理器池，无全局/原型扩展依赖）",
+    "main": "index.js",
+    "scripts": {
+        "start": "node tests/test.js",
+        "test": "node tests/test.js",
+        "lint": "eslint . --config eslint.config.js",
+        "lint:fix": "eslint . --config eslint.config.js --fix",
+        "lint:check": "eslint . --config eslint.config.js --max-warnings 0"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://gitee.com/qiuwenwu91/mm_dao.git"
+    },
+    "keywords": [
+        "mm_mod",
+        "mm_infra",
+        "mm_runtime",
+        "sql",
+        "mysql",
+        "sql server",
+        "sqlite",
+        "database",
+        "async",
+        "await",
+        "promise",
+        "add",
+        "del",
+        "set",
+        "get",
+        "query",
+        "run",
+        "exec",
+        "orm",
+        "多数据库",
+        "database-adapter"
+    ],
+    "layer": "infra",
+    "group": "repo",
+    "author": "邱文武",
+    "license": "ISC",
+    "bugs": {
+        "url": "https://gitee.com/qiuwenwu91/mm_dao/issues"
+    },
+    "homepage": "https://gitee.com/qiuwenwu91/mm_dao#readme",
+    "engines": {
+        "node": ">=12.0.0"
+    },
+    "dependencies": {
+        "mm_corejs": "^1.1.4",
+        "mm_dbs": "^1.0.1",
+        "mm_excel": "^1.2.4",
+        "mm_helper": "^1.0.0",
+        "mm_machine": "^3.5.4",
+        "mm_ret": "^1.4.8",
+        "mm_sql": "^1.8.0"
+    },
+    "devDependencies": {
+        "eslint": "^10.9.1",
+        "eslint-plugin-jsdoc": "^64.2.1",
+        "mm_eslint": "^1.7.7"
+    }
+}