vona-module-a-orm 5.1.41 → 5.1.43

package/dist/index.js

@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import { BeanInfo, BeanBase, BeanAopMethodBase, deepExtend, appResource, assertIsolatedTestDatabaseClient, assertTestClaimDatabaseClient, beanFullNameFromOnionName, cast, useApp, $makeLocaleMagic, Virtual, registerTestClaimDatabaseCreation, BeanSimple, combineConfigDefault, BeanScopeBase, createBeanDecorator, PickClassInner, $Class, registerMappedClassMetadataKey, appMetadata, disposeInstance } from 'vona';
+import { BeanInfo, BeanBase, BeanAopMethodBase, deepExtend, appResource, assertIsolatedTestDatabaseClient, assertTestClaimDatabaseClient, beanFullNameFromOnionName, cast, useApp, $makeLocaleMagic, Virtual, registerTestClaimDatabaseCreation, BeanSimple, combineConfigDefault, BeanScopeBase, createBeanDecorator, PickClassInner, $Class, registerMappedClassMetadataKey, appMetadata, disposeInstance, getTestAsyncCompletion } from 'vona';
 import { __decorate, __metadata } from 'tslib';
 import { Schedule } from 'vona-module-a-schedule';
 import { AopMethod } from 'vona-module-a-aspect';
@@ -1085,10 +1085,10 @@ function _buildWhereColumnOpNormal(having, db, builder, column, value, op) {
   } else if (op === Op.notEq) {
     builder[having ? 'having' : 'where'](column, '<>', value);
   } else if (op === Op.eqI) {
-    builder[_getOpILikeReal(having, db)](column, value);
+    builder[_getOpILikeReal(having, db)](column, _literalILikeValue(db, value));
   } else if (op === Op.notEqI) {
     builder[having ? 'havingNot' : 'whereNot'](builder => {
-      builder[_getOpILikeReal(having, db)](column, value);
+      builder[_getOpILikeReal(false, db)](column, _literalILikeValue(db, value));
     });
   } else if (op === Op.gt) {
     builder[having ? 'having' : 'where'](column, '>', value);
@@ -1126,6 +1126,10 @@ function _buildWhereColumnOpNormal(having, db, builder, column, value, op) {
     builder[having ? 'having' : 'where'](column, '=', db.connection.ref(value));
   }
 }
+function _literalILikeValue(db, value) {
+  if (typeof value !== 'string') return value;
+  return db.connection.raw("? escape '!'", [value.replace(/[!%_]/g, '!$&')]);
+}
 function _getOpLikeReal(having, db) {
   return db.dialect.capabilities.like ? having ? 'havingLike' : 'whereLike' : having ? 'havingILike' : 'whereILike';
 }
@@ -4721,8 +4725,13 @@ class BeanModelCache extends BeanModelCrud {
   _shardingCacheDoubleDelete(jobData) {
     const doubleDelete = this.scopeOrm.config.sharding.cache.doubleDelete;
     if (!doubleDelete) return;
+    const owner = getTestAsyncCompletion(this.app);
     this.db.commit(() => {
-      this.scopeOrm.queue.doubleDelete.push(jobData);
+      if (owner) {
+        void owner.track('ORM double-delete', () => this.scopeOrm.queue.doubleDelete.pushAsync(jobData)).catch(() => {});
+      } else {
+        this.scopeOrm.queue.doubleDelete.push(jobData);
+      }
     });
   }
   async _cacheQueryClearModelsClear() {