mm_dao 1.8.4 → 1.8.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/dao.js CHANGED
@@ -561,16 +561,23 @@ Dao.prototype.getObj = async function (db, query, body) {
561
561
  var qy = { ...query };
562
562
  qy.page = 1;
563
563
  qy.size = 1;
564
- var ret = await this.getMain(db, qy, 'get_obj');
565
- if (ret.result) {
566
- var list = ret.result.list;
567
- if (list.length > 0) {
568
- return getRet().body({ obj: list[0] });
569
- } else {
570
- return getRet().body({ obj: null });
564
+ // get_obj 只是「取一条」,它改的是共享表模型上的分页与字段状态,用完必须还原:
565
+ // 否则同一实例上的后续列表查询会被截断成 1 条,字段也可能串成 field_obj
566
+ var old_page = db.page;
567
+ var old_size = db.size;
568
+ var old_field = db.field;
569
+ try {
570
+ var ret = await this.getMain(db, qy, 'get_obj');
571
+ if (ret.result) {
572
+ var list = ret.result.list;
573
+ return getRet().body({ obj: list && list.length > 0 ? list[0] : null });
571
574
  }
575
+ return ret;
576
+ } finally {
577
+ db.page = old_page;
578
+ db.size = old_size;
579
+ db.field = old_field;
572
580
  }
573
- return ret;
574
581
  };
575
582
 
576
583
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mm_dao",
3
- "version": "1.8.4",
3
+ "version": "1.8.6",
4
4
  "description": "一个通用的SQL帮助类,支持通过切换db_type实现对不同数据库的操作,包括MySQL和SQLite等;另提供 manager.js/drive.js 的SQL模板管理器(融合自 mm_os com/sql,基于 mm_corejs,内置管理器池,无全局/原型扩展依赖)",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -242,3 +242,18 @@ test('del_repeat: 只在本用户范围内去重,不删他人重复项', async
242
242
  );
243
243
  assert.strictEqual(left.length, 2, '每个用户各留一条');
244
244
  });
245
+
246
+ test('get_obj: 不污染共享表模型的分页状态', async () => {
247
+ const db = makeTable();
248
+ await reset(db);
249
+ await db.exec("INSERT INTO demo (name, cnt) VALUES ('a', 1), ('b', 2), ('c', 3)");
250
+ const dao = new Dao({ name: 'm_getobj_page', table: 'demo', key: 'id' });
251
+ const before_page = db.page;
252
+ const before_size = db.size;
253
+ const ret = await dao.run({ method: 'get_obj', name: 'a' }, {}, db);
254
+ assert.ok(ret.result && ret.result.obj, JSON.stringify(ret.error || ret.result));
255
+ assert.strictEqual(db.size, before_size, 'size 应还原,否则后续查询被截断');
256
+ assert.strictEqual(db.page, before_page, 'page 应还原');
257
+ const list = await db.getSql('', '', 'id');
258
+ assert.strictEqual(list.length, 3, '后续查询应返回全部 3 条');
259
+ });