vona-module-a-orm 5.1.24 → 5.1.26

package/cli/model/metadata/generate.ts

@@ -32,6 +32,8 @@ export default async function (options: IMetadataCustomGenerateOptions): Promise
       [SymbolKeyEntityMeta]: ${entityMetaName};
       [SymbolKeyModelOptions]: ${opionsName};
       get<T extends IModelGetOptions<${entityName},${className}>>(where: TypeModelWhere<${entityName}>, options?: T): Promise<TypeModelRelationResult<${entityName}, ${className}, T> | undefined>;
+      getForUpdate<T extends IModelGetOptions<${entityName},${className}>>(where: TypeModelWhere<${entityName}>, options?: T): Promise<TypeModelRelationResult<${entityName}, ${className}, T> | undefined>;
+      getByIdForUpdate<T extends IModelGetOptions<${entityName},${className}>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<${entityName}, ${className}, T> | undefined>;
       mget<T extends IModelGetOptions<${entityName},${className}>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<${entityName}, ${className}, T>[]>;
       selectAndCount<T extends IModelSelectParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<${entityName}, ${className}, T>>;
       select<T extends IModelSelectParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<${entityName}, ${className}, T>[]>;
@@ -245,18 +247,10 @@ function __parseRelation_options(node: t.Node) {
     aggrs = options?.aggrs;
   }
   // columns
-  if (!options?.columns) {
-    if (options?.groups) {
-      columns = 'undefined';
-    } else {
-      columns = 'undefined'; // '\'*\'';
-    }
+  if (!options?.columns || options.columns.includes('*')) {
+    columns = "'*'";
   } else {
-    if (options?.columns.includes('*')) {
-      columns = "'*'";
-    } else {
-      columns = __joinColumnsType(options?.columns, false);
-    }
+    columns = __joinColumnsType(options.columns, false);
   }
   return { autoload, columns, groups, aggrs };
 }

package/dist/index.js

@@ -1324,7 +1324,7 @@ class BeanModelUtils extends BeanModelMeta {
       if (Object.prototype.hasOwnProperty.call(item, columnName)) {
         let value = item[columnName];
         dataOriginal[columnName] = value;
-        if (column.type === 'json' && value !== undefined) {
+        if (column.type === 'json' && !isNil(value)) {
           value = JSON.stringify(value);
         }
         data[columnName] = value;
@@ -1886,6 +1886,9 @@ class BeanModelCrudInner extends BeanModelView {
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // data
     [data] = await this.prepareData(table, data);
+    for (const key in data) {
+      if (data[key] === undefined) data[key] = null;
+    }
     // where
     const where = Object.assign({}, options?.where);
     // id
@@ -3878,6 +3881,45 @@ class BeanModelCache extends BeanModelCrud {
     }
     return item;
   }
+  async getForUpdate(where, options) {
+    if (!this.db.inTransaction) {
+      throw new Error('model error: getForUpdate requires an active transaction');
+    }
+    const optionsLock = Object.assign({}, options, {
+      disableCacheEntity: true,
+      disableCacheQuery: true
+    });
+    const relations = this.relations.handleRelationsCollection(optionsLock);
+    const [options2, refKeys] = this.relations.prepareColumnsByRelations(relations, optionsLock);
+    let item = await this.__getForUpdate_raw(undefined, where, options2);
+    if (!item) return item;
+    item = await this.relations.handleRelationsOne(relations, item, optionsLock, optionsLock);
+    if (refKeys) {
+      for (const refKey of refKeys) {
+        delete item[refKey];
+      }
+    }
+    return item;
+  }
+  async getByIdForUpdate(id, options) {
+    return await this.getForUpdate({
+      id
+    }, options);
+  }
+  async __getForUpdate_raw(table, where, options) {
+    table = table || this.getTable(where);
+    if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
+    const params = {
+      where,
+      limit: 1
+    };
+    if (options?.columns) {
+      params.columns = options.columns;
+    }
+    const builder = this._select_buildParams(table, params, options).forUpdate();
+    const items = await super._select(table, params, options, builder);
+    return items[0];
+  }
   async __get_raw(table, where, options) {
     // table
     table = table || this.getTable(where);