@maiyunnet/kebab 4.1.0 → 5.0.0

package/sys/mod.js

@@ -4,7 +4,7 @@
  * Last: 2020-4-14 13:33:51, 2022-07-23 16:01:34, 2022-09-06 22:59:26, 2023-5-24 19:11:37, 2023-6-13 21:47:58, 2023-7-10 18:54:03, 2023-8-23 17:03:16, 2023-12-11 15:21:22, 2023-12-20 23:12:03, 2024-3-8 16:05:29, 2024-3-20 19:58:15, 2024-8-11 21:14:54, 2024-10-5 14:00:22, 2024-12-14 19:58:34, 2025-9-23 11:01:36, 2025-11-5 16:34:31
  */
 import * as lSql from '#kebab/lib/sql.js';
-import * as lTime from '#kebab/lib/time.js';
+import * as lDb from '#kebab/lib/db.js';
 import * as lCore from '#kebab/lib/core.js';
 import * as lText from '#kebab/lib/text.js';
 import * as sCtr from '#kebab/sys/ctr.js';
@@ -54,8 +54,6 @@ export default class Mod {
     static { this._$key = ''; }
     /** --- 若使用 _$key 并且有多个 unique 索引，这里指定 _$key 的索引名 --- */
     static { this._$index = ''; }
-    /** ---- 可开启软删软更新软新增 --- */
-    static { this._$soft = false; }
     /**
      * --- 构造函数 ---
      * @param ctr Ctr 对象
@@ -81,7 +79,9 @@ export default class Mod {
         /** --- 导入数据库连接 --- */
         this._db = opt.db;
         /** --- 新建 sql 对象 --- */
-        this._sql = lSql.get(opt.pre ?? opt.ctr);
+        this._sql = lSql.get(opt.pre ?? opt.ctr, {
+            'service': this._db.getService() ?? lDb.ESERVICE.PGSQL,
+        });
         if (opt.index) {
             this._index = typeof opt.index === 'string' ? [opt.index] : [...new Set(opt.index)];
         }
@@ -102,19 +102,6 @@ export default class Mod {
             (this._index !== null ? ('_' + this._index[0]) : '') +
             (opt.alias ? ' ' + opt.alias : ''));
         if (opt.where !== undefined) {
-            if (this.constructor._soft && !opt.raw) {
-                if (typeof opt.where === 'string') {
-                    opt.where = opt.where ? ('(' + opt.where + ') AND ') : '`time_remove` = 0';
-                }
-                else if (Array.isArray(opt.where)) {
-                    opt.where.push({
-                        'time_remove': 0
-                    });
-                }
-                else {
-                    opt.where['time_remove'] = 0;
-                }
-            }
             this._sql.where(opt.where);
         }
     }
@@ -131,7 +118,9 @@ export default class Mod {
      * @param opt 选项
      */
     static async insert(db, cs, vs, opt = {}) {
-        const sq = lSql.get(opt.pre);
+        const sq = lSql.get(opt.pre, {
+            'service': db.getService() ?? lDb.ESERVICE.PGSQL,
+        });
         if (!vs) {
             // --- 单行 ---
             sq.insert(this._$table + (opt.index ? ('_' + opt.index) : ''));
@@ -141,7 +130,7 @@ export default class Mod {
                 lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[insert, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1), '-error');
                 return false;
             }
-            return r.packet.affectedRows > 0 ? true : null;
+            return r.packet.affected ? true : null;
         }
         // --- 可能是多行 ---
         if (vs.some(item => !Array.isArray(item))) {
@@ -161,7 +150,7 @@ export default class Mod {
                 lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[insert, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1), '-error');
                 return false;
             }
-            if (r.packet.affectedRows > 0) {
+            if (r.packet.affected) {
                 continue;
             }
             return null;
@@ -170,37 +159,18 @@ export default class Mod {
     }
     /**
      * --- 获取添加一个序列的模拟 SQL ---
+     * @param db 数据库对象
      * @param cs 字段列表
      * @param vs 数据列表
      * @param opt 选项
      */
-    static insertSql(cs, vs, opt = {}) {
-        const sq = lSql.get(opt.pre);
+    static insertSql(db, cs, vs, opt = {}) {
+        const sq = lSql.get(opt.pre, {
+            'service': db.getService() ?? lDb.ESERVICE.PGSQL,
+        });
         sq.insert(this._$table + (opt.index ? ('_' + opt.index) : '')).values(cs, vs);
         return sq.format();
     }
-    /**
-     * --- 插入数据如果唯一键冲突则更新 ---
-     * @param db 数据库对象
-     * @param data 要插入的数据
-     * @param update 要更新的数据
-     * @param opt 选项
-     */
-    static async insertDuplicate(db, data, update, opt = {}) {
-        const sq = lSql.get(opt.pre);
-        sq.insert(this._$table + (opt.index ? ('_' + opt.index) : '')).values(data).duplicate(update);
-        const r = await db.execute(sq.getSql(), sq.getData());
-        if (r.packet === null) {
-            lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[insertDuplicate, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
-            return false;
-        }
-        if (r.packet.affectedRows > 0) {
-            return true;
-        }
-        else {
-            return null;
-        }
-    }
     /**
      * --- 根据条件移除条目 ---
      * @param db 数据库对象
@@ -208,36 +178,13 @@ export default class Mod {
      * @param opt 选项
      */
     static async removeByWhere(db, where, opt = {}) {
-        const tim = lTime.stamp();
         const indexs = opt.index ? (typeof opt.index === 'string' ? [opt.index] : [...new Set(opt.index)]) : [''];
-        if (this._$soft && !opt.raw) {
-            // --- 软删除 ---
-            if (typeof where === 'string') {
-                where = '(' + where + ') AND `time_remove` = 0';
-            }
-            else if (Array.isArray(where)) {
-                where.push({
-                    'time_remove': 0
-                });
-            }
-            else {
-                where['time_remove'] = 0;
-            }
-        }
         let ar = 0;
         for (const index of indexs) {
-            const sq = lSql.get(opt.pre);
-            if (this._$soft && !opt.raw) {
-                // --- 软删除 ---
-                sq.update(this._$table + (index ? ('_' + index) : ''), [{
-                        'time_remove': tim,
-                    }]);
-            }
-            else {
-                // --- 真删除 ---
-                sq.delete(this._$table + (index ? ('_' + index) : ''));
-            }
-            sq.where(where);
+            const sq = lSql.get(opt.pre, {
+                'service': db.getService() ?? lDb.ESERVICE.PGSQL,
+            });
+            sq.delete(this._$table + (index ? ('_' + index) : '')).where(where);
             if (opt.by) {
                 sq.by(opt.by[0], opt.by[1]);
             }
@@ -246,11 +193,11 @@ export default class Mod {
             }
             const r = await db.execute(sq.getSql(), sq.getData());
             if (r.packet === null) {
-                lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[removeByWhere, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[MOD][removeByWhere] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
                 return false;
             }
-            if (r.packet.affectedRows > 0) {
-                ar += r.packet.affectedRows;
+            if (r.packet.affected) {
+                ar += r.packet.affected;
             }
         }
         return ar ? ar : null;
@@ -262,30 +209,10 @@ export default class Mod {
      * @param opt 选项
      */
     static removeByWhereSql(db, where, opt = {}) {
-        const tim = lTime.stamp();
-        const sq = lSql.get(opt.pre);
-        if (this._$soft && !opt.raw) {
-            // --- 软删除 ---
-            sq.update(this._$table + (opt.index ? ('_' + opt.index) : ''), [{
-                    'time_remove': tim
-                }]);
-            if (typeof where === 'string') {
-                where = '(' + where + ') AND `time_remove` = 0';
-            }
-            else if (Array.isArray(where)) {
-                where.push({
-                    'time_remove': 0
-                });
-            }
-            else {
-                where['time_remove'] = 0;
-            }
-        }
-        else {
-            // --- 真删除 ---
-            sq.delete(this._$table + (opt.index ? ('_' + opt.index) : ''));
-        }
-        sq.where(where);
+        const sq = lSql.get(opt.pre, {
+            'service': db.getService() ?? lDb.ESERVICE.PGSQL,
+        });
+        sq.delete(this._$table + (opt.index ? ('_' + opt.index) : '')).where(where);
         if (opt.by) {
             sq.by(opt.by[0], opt.by[1]);
         }
@@ -303,24 +230,12 @@ export default class Mod {
      */
     static async updateByWhere(db, data, where, opt = {}) {
         const indexs = opt.index ? (typeof opt.index === 'string' ? [opt.index] : [...new Set(opt.index)]) : [''];
-        if (this._$soft && !opt.raw) {
-            if (typeof where === 'string') {
-                where = '(' + where + ') AND `time_remove` = 0';
-            }
-            else if (Array.isArray(where)) {
-                where.push({
-                    'time_remove': 0
-                });
-            }
-            else {
-                where['time_remove'] = 0;
-            }
-        }
         let ar = 0;
         for (const index of indexs) {
-            const sq = lSql.get(opt.pre);
-            sq.update(this._$table + (index ? ('_' + index) : ''), data);
-            sq.where(where);
+            const sq = lSql.get(opt.pre, {
+                'service': db.getService() ?? lDb.ESERVICE.PGSQL,
+            });
+            sq.update(this._$table + (index ? ('_' + index) : ''), data).where(where);
             if (opt.by) {
                 sq.by(opt.by[0], opt.by[1]);
             }
@@ -329,38 +244,27 @@ export default class Mod {
             }
             const r = await db.execute(sq.getSql(), sq.getData());
             if (r.packet === null) {
-                lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[updateByWhere, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[MOD][updateByWhere] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
                 return false;
             }
-            if (r.packet.affectedRows > 0) {
-                ar += r.packet.affectedRows;
+            if (r.packet.affected) {
+                ar += r.packet.affected;
             }
         }
         return ar ? ar : null;
     }
     /**
      * --- 根据条件更新数据（仅获取 SQL 对象） ---
+     * @param db 数据库对象
      * @param data 要更新的数据
      * @param where 筛选条件
      * @param opt 选项
      */
-    static updateByWhereSql(data, where, opt = {}) {
-        const sq = lSql.get(opt.pre);
-        sq.update(this._$table + (opt.index ? ('_' + opt.index) : ''), data);
-        if (this._$soft && !opt.raw) {
-            if (typeof where === 'string') {
-                where = '(' + where + ') AND `time_remove` = 0';
-            }
-            else if (Array.isArray(where)) {
-                where.push({
-                    'time_remove': 0
-                });
-            }
-            else {
-                where['time_remove'] = 0;
-            }
-        }
-        sq.where(where);
+    static updateByWhereSql(db, data, where, opt = {}) {
+        const sq = lSql.get(opt.pre, {
+            'service': db.getService() ?? lDb.ESERVICE.PGSQL,
+        });
+        sq.update(this._$table + (opt.index ? ('_' + opt.index) : ''), data).where(where);
         if (opt.by) {
             sq.by(opt.by[0], opt.by[1]);
         }
@@ -504,23 +408,9 @@ export default class Mod {
      * @param opt 选项
      */
     static async primarys(db, where = '', opt = {}) {
-        const sq = lSql.get(opt.pre ?? opt.ctr);
-        if (this._$soft && !opt.raw) {
-            // --- 不包含已删除 ---
-            if (typeof where === 'string') {
-                if (where !== '') {
-                    where = '(' + where + ') AND `time_remove` = 0';
-                }
-            }
-            else if (Array.isArray(where)) {
-                where.push({
-                    'time_remove': 0
-                });
-            }
-            else {
-                where['time_remove'] = 0;
-            }
-        }
+        const sq = lSql.get(opt.pre ?? opt.ctr, {
+            'service': db.getService() ?? lDb.ESERVICE.PGSQL,
+        });
         sq.select(this._$primary, this._$table + (opt.index ? ('_' + opt.index) : '')).where(where);
         const r = await db.query(sq.getSql(), sq.getData());
         if (r.rows === null) {
@@ -585,16 +475,13 @@ export default class Mod {
     }
     /**
      * --- 创建数据 ---
-     * @param notWhere 若要不存在才成功，则要传入限定条件
-     * @param table 可对限定条件传入适当的表
      */
-    async create(notWhere, table) {
+    async create() {
         const cstr = this.constructor;
         const updates = {};
         for (const k in this._updates) {
             updates[k] = this._data[k];
         }
-        table ??= cstr._$table + (this._index ? ('_' + this._index[0]) : '');
         let r = null;
         if ((cstr._$key !== '') && (updates[cstr._$key] === undefined)) {
             let count = 0;
@@ -606,12 +493,7 @@ export default class Mod {
                 this._data[cstr._$key] = updates[cstr._$key];
                 this[cstr._$key] = updates[cstr._$key];
                 this._sql.insert(cstr._$table + (this._index ? ('_' + this._index[0]) : ''));
-                if (notWhere) {
-                    this._sql.notExists(table, updates, notWhere);
-                }
-                else {
-                    this._sql.values(updates);
-                }
+                this._sql.values(updates);
                 r = await this._db.execute(this._sql.getSql(), this._sql.getData());
                 ++count;
                 if (!r.error) {
@@ -623,63 +505,45 @@ export default class Mod {
                         // --- 没设置 index，那就当做是本次生成的 key 重复了 ---
                         continue;
                     }
-                    const match = /for key '([\w.]+)'/.exec(r.error.message);
-                    if (match?.[1].includes(cstr._$index)) {
-                        // --- 确实重复了 ---
-                        continue;
+                    if (this._db.getService() === lDb.ESERVICE.MYSQL) {
+                        // --- MYSQL ---
+                        const match = /for key '([\w.]+)'/.exec(r.error.message);
+                        if (match?.[1].includes(cstr._$index)) {
+                            continue;
+                        }
+                    }
+                    else {
+                        // --- PGSQL ---
+                        const match = /constraint "([\w.]+)"/.exec(r.error.message);
+                        if (match?.[1].includes(cstr._$index)) {
+                            continue;
+                        }
                     }
                     // --- 1062 非 index 冲突，那需要用户自行处理（可能不允许重复的邮箱） ---
                     return false;
                 }
                 // --- 未处理的错误 ---
-                lCore.log(this._ctr ?? {}, '[create0, mod] [' + table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                const service = this._db.getService();
+                lCore.debug('[MOD][create0][' + cstr._$table + ']', service !== null ? lDb.ESERVICE[service] : 'NONE', r);
+                lCore.log(this._ctr ?? {}, '[MOD][create0][' + cstr._$table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
                 return false;
             }
         }
         else {
             this._sql.insert(cstr._$table + (this._index ? ('_' + this._index[0]) : ''));
-            if (notWhere) {
-                this._sql.notExists(table, updates, notWhere);
-            }
-            else {
-                this._sql.values(updates);
-            }
+            this._sql.values(updates);
             r = await this._db.execute(this._sql.getSql(), this._sql.getData());
             if (r.error) {
                 if (r.error.errno !== 1062) {
-                    lCore.log(this._ctr ?? {}, '[create1, mod] [' + table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                    lCore.debug('[MOD][create1][' + cstr._$table + ']', r);
+                    lCore.log(this._ctr ?? {}, '[MOD][create1][' + cstr._$table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
                 }
                 return false;
             }
         }
-        if (r?.packet?.affectedRows && r?.packet?.affectedRows > 0) {
+        if (r.packet?.affected) {
             this._updates = {};
-            this._data[cstr._$primary] = r.packet.insertId;
-            this[cstr._$primary] = this._data[cstr._$primary];
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-    /**
-     * --- 唯一键冲突则替换，不冲突则创建数据 ---
-     */
-    async replace() {
-        const cstr = this.constructor;
-        const updates = {};
-        for (const k in this._updates) {
-            updates[k] = this._data[k];
-        }
-        this._sql.replace(cstr._$table + (this._index ? ('_' + this._index[0]) : '')).values(updates);
-        const r = await this._db.execute(this._sql.getSql(), this._sql.getData());
-        if (r.packet === null) {
-            lCore.log(this._ctr ?? {}, '[replace, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
-            return false;
-        }
-        if (r.packet.affectedRows > 0) {
-            this._updates = {};
-            this._data[cstr._$primary] = r.packet.insertId;
+            this._data[cstr._$primary] = r.packet.insert;
             this[cstr._$primary] = this._data[cstr._$primary];
             return true;
         }
@@ -734,7 +598,7 @@ export default class Mod {
             lCore.log(this._ctr ?? {}, '[save, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
-        if (r.packet.affectedRows > 0) {
+        if (r.packet.affected) {
             this._updates = {};
             return true;
         }
@@ -744,30 +608,18 @@ export default class Mod {
     }
     /**
      * --- 移除本条目 ---
-     * @param raw 是否真实移除
      */
-    async remove(raw = false) {
-        const tim = lTime.stamp();
+    async remove() {
         const cstr = this.constructor;
-        if (cstr._$soft && !raw) {
-            this._sql.update(cstr._$table + (this._index ? ('_' + this._index[0]) : ''), [{
-                    'time_remove': tim
-                }]).where([{
-                    [cstr._$primary]: this._data[cstr._$primary],
-                    'time_remove': 0
-                }]);
-        }
-        else {
-            this._sql.delete(cstr._$table + (this._index ? ('_' + this._index[0]) : '')).where([{
-                    [cstr._$primary]: this._data[cstr._$primary]
-                }]);
-        }
+        this._sql.delete(cstr._$table + (this._index ? ('_' + this._index[0]) : '')).where([{
+                [cstr._$primary]: this._data[cstr._$primary]
+            }]);
         const r = await this._db.execute(this._sql.getSql(), this._sql.getData());
         if (r.packet === null) {
             lCore.log(this._ctr ?? {}, '[remove, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
-        if (r.packet.affectedRows > 0) {
+        if (r.packet.affected) {
             return true;
         }
         else {
@@ -888,7 +740,7 @@ export default class Mod {
             for (let i = 0; i < this._index.length; ++i) {
                 // --- 先计算 total ---
                 if (i > 0) {
-                    sql = sql.replace(/(FROM [a-zA-Z0-9`_.]+?_)[0-9_]+/, '$1' + this._index[i]);
+                    sql = sql.replace(/(FROM [a-zA-Z0-9`"_.]+?_)[0-9_]+/, '$1' + this._index[i]);
                 }
                 const tsql = this._formatTotal(sql);
                 const tr = await this._db.query(tsql, this._sql.getData());
@@ -914,10 +766,10 @@ export default class Mod {
                         continue;
                     }
                 }
-                const lsql = sql.replace(/ LIMIT [0-9 ,]/g, ` LIMIT ${cz}, ${remain}`);
+                const lsql = sql.replace(/ LIMIT [0-9 ,]+(OFFSET [0-9]+)?/g, ` LIMIT ${remain} OFFSET ${cz}`);
                 const r = await this._db.query(lsql, this._sql.getData());
                 if (r.rows === null) {
-                    lCore.log(this._ctr ?? {}, '[all, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                    lCore.log(this._ctr ?? {}, '[MOD][all] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
                     return false;
                 }
                 if (key) {
@@ -927,7 +779,7 @@ export default class Mod {
                             'ctr': this._ctr,
                             'pre': this._sql.getPre(),
                             'row': row,
-                            'index': this._index
+                            'index': this._index,
                         });
                         list[row[key]] = obj;
                         --remain;
@@ -940,7 +792,7 @@ export default class Mod {
                         'ctr': this._ctr,
                         'pre': this._sql.getPre(),
                         'row': row,
-                        'index': this._index
+                        'index': this._index,
                     });
                     list.push(obj);
                     --remain;
@@ -954,7 +806,7 @@ export default class Mod {
         const contain = this._contain ? lCore.clone(this._contain.list) : null;
         const r = await this._db.query(this._sql.getSql(), this._sql.getData());
         if (r.rows === null) {
-            lCore.log(this._ctr ?? {}, '[all, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[MOD][all] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
         // --- 检查没被查到的必包含项 ---
@@ -983,7 +835,7 @@ export default class Mod {
                     'ctr': this._ctr,
                     'pre': this._sql.getPre(),
                     'row': row,
-                    'index': this._index
+                    'index': this._index,
                 });
                 list[row[key]] = obj;
             }
@@ -995,7 +847,7 @@ export default class Mod {
                         'ctr': this._ctr,
                         'pre': this._sql.getPre(),
                         'row': crow,
-                        'index': this._index
+                        'index': this._index,
                     });
                     list[crow[key]] = obj;
                 }
@@ -1048,7 +900,7 @@ export default class Mod {
             for (let i = 0; i < this._index.length; ++i) {
                 // --- 先计算 total ---
                 if (i > 0) {
-                    sql = sql.replace(/(FROM [a-zA-Z0-9`_.]+?_)[0-9_]+/, '$1' + this._index[i]);
+                    sql = sql.replace(/(FROM [a-zA-Z0-9`"_.]+?_)[0-9_]+/, '$1' + this._index[i]);
                 }
                 const tsql = this._formatTotal(sql);
                 const tr = await this._db.query(tsql, this._sql.getData());
@@ -1076,10 +928,10 @@ export default class Mod {
                     // --- 在本表开始找之后，后面表无需再跳过 ---
                     offset = -1;
                 }
-                const lsql = sql.replace(/ LIMIT [0-9 ,]+/g, ` LIMIT ${cz}, ${remain}`);
+                const lsql = sql.replace(/ LIMIT [0-9 ,]+(OFFSET [0-9]+)?/g, ` LIMIT ${remain} OFFSET ${cz}`);
                 const r = await this._db.query(lsql, this._sql.getData());
                 if (r.rows === null) {
-                    lCore.log(this._ctr ?? {}, '[allArray, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                    lCore.log(this._ctr ?? {}, '[MOD][allArray] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
                     return false;
                 }
                 if (key) {
@@ -1101,7 +953,7 @@ export default class Mod {
         const contain = this._contain ? lCore.clone(this._contain.list) : null;
         const r = await this._db.query(this._sql.getSql(), this._sql.getData());
         if (r.rows === null) {
-            lCore.log(this._ctr ?? {}, '[allArray, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[MOD][allArray] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
         // --- 检查没被查到的必包含项 ---
@@ -1144,32 +996,40 @@ export default class Mod {
         return r.rows;
     }
     /**
-     * --- 获取数查询（SELECT）扫描情况，获取字符串或kv数组 ---
+     * --- 获取数查询（SELECT）扫描情况，获取字符串或对象 ---
      * @param all 是否获取完全的情况，默认不获取，只返回扫描情况
      */
     async explain(all = false) {
         const r = await this._db.query('EXPLAIN ' + this._sql.getSql(), this._sql.getData());
         if (r.rows === null) {
-            lCore.log(this._ctr ?? {}, '[explain, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[MOD][explain] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
         if (!r.rows[0]) {
             return false;
         }
         if (!all) {
-            return r.rows[0].type;
-        }
-        return r.rows[0];
+            return this._db.getService() === lDb.ESERVICE.MYSQL ?
+                r.rows[0].type :
+                r.rows[0]['QUERY PLAN'];
+        }
+        return this._db.getService() === lDb.ESERVICE.MYSQL ?
+            r.rows[0] :
+            {
+                'scan': r.rows[0]['QUERY PLAN'],
+                'filter': r.rows[1]['QUERY PLAN'],
+            };
     }
     _formatTotal(sql, f = '*') {
+        const q = this._db.getService() === lDb.ESERVICE.MYSQL ? '`' : '"';
         sql = sql
-            .replace(/ LIMIT [0-9 ,]+/g, '')
-            .replace(/ ORDER BY [\w`,. ]+(DESC|ASC)?/g, '');
+            .replace(/ LIMIT [0-9 ,]+(OFFSET [0-9]+)?/g, '')
+            .replace(/ ORDER BY [\w`",. ]+(DESC|ASC)?/g, '');
         if (sql.includes(' GROUP BY ')) {
             return 'SELECT COUNT(0) AS `count` FROM(' + sql + ') AS `f`';
         }
         return sql
-            .replace(/SELECT .+? FROM/g, 'SELECT COUNT(' + this._sql.field(f) + ') AS `count` FROM');
+            .replace(/SELECT .+? FROM/g, `SELECT COUNT(${this._sql.field(f)}) AS ${q}count${q} FROM`);
     }
     /**
      * --- 获取总条数，自动抛弃 LIMIT，仅用于获取数据的情况（select） ---
@@ -1185,7 +1045,7 @@ export default class Mod {
         const sql = this._formatTotal(this._sql.getSql(), f);
         const r = await this._db.query(sql, this._sql.getData());
         if (r.rows === null) {
-            lCore.log(this._ctr ?? {}, '[total, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[MOD][total] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return 0;
         }
         let count = 0;
@@ -1198,10 +1058,12 @@ export default class Mod {
      * --- 根据当前条件，筛选出当前条目该有的数据条数 ---
      */
     async count() {
-        const sql = this._sql.getSql().replace(/SELECT .+? FROM/, 'SELECT COUNT(0) AS `count` FROM');
+        const sql = this._sql.getSql().replace(/SELECT .+? FROM/, this._db.getService() === lDb.ESERVICE.MYSQL ?
+            'SELECT COUNT(0) AS `count` FROM' :
+            'SELECT COUNT(0) AS "count" FROM');
         const r = await this._db.query(sql, this._sql.getData());
         if (r.rows === null) {
-            lCore.log(this._ctr ?? {}, '[count, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[MOD][count] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return 0;
         }
         let count = 0;
@@ -1214,7 +1076,8 @@ export default class Mod {
      * --- 获取当前条件下的 count 的 SQL 语句 ---
      */
     countSql() {
-        const sql = this._sql.getSql().replace(/SELECT .+? FROM/, 'SELECT COUNT(0) AS `count` FROM');
+        const sql = this._sql.getSql().replace(/SELECT .+? FROM/, this._db.getService() === lDb.ESERVICE.MYSQL ?
+            'SELECT COUNT(0) AS `count` FROM' : 'SELECT COUNT(0) AS "count" FROM');
         return this._sql.format(sql, this._sql.getData());
     }
     /**
@@ -1291,21 +1154,7 @@ export default class Mod {
      * @param s 筛选条件数组或字符串
      * @param raw 是否包含已被软删除的数据
      */
-    filter(s, raw = false) {
-        const cstr = this.constructor;
-        if (cstr._soft && !raw) {
-            if (typeof s === 'string') {
-                s = '(' + s + ') AND `time_remove` = 0';
-            }
-            else if (Array.isArray(s)) {
-                s.push({
-                    'time_remove': 0
-                });
-            }
-            else {
-                s['time_remove'] = 0;
-            }
-        }
+    filter(s) {
         this._sql.where(s);
         return this;
     }
@@ -1314,8 +1163,8 @@ export default class Mod {
      * @param s 筛选条件数组或字符串
      * @param raw 是否包含已被软删除的数据
      */
-    where(s, raw = false) {
-        return this.filter(s, raw);
+    where(s) {
+        return this.filter(s);
     }
     /**
      * --- ORDER BY ---