vona-module-a-orm 5.1.23 → 5.1.25

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/bean/bean.database.d.ts

@@ -1,8 +1,8 @@
 import type { FunctionAsync } from 'vona';
 import { BeanBase } from 'vona';
+import type { ServiceDatabaseDialectBase } from '../service/databaseDialectBase_.ts';
 import type { ConfigDatabaseClient } from '../types/config.ts';
 import type { IDatabaseClientDialectRecord, IDatabaseClientRecord, IDbInfo } from '../types/database.ts';
-import type { ServiceDatabaseDialectBase } from '../service/databaseDialectBase_.ts';
 import { ServiceDatabaseClient } from '../service/databaseClient_.ts';
 export declare class BeanDatabase extends BeanBase {
     get current(): import("vona-module-a-orm").ServiceDb;

package/dist/bean/bean.database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bean.database.d.ts","sourceRoot":"","sources":["../../src/bean/bean.database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,EAAE,QAAQ,EAA6B,MAAM,MAAM,CAAC;AAG3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,KAAK,EACV,4BAA4B,EAC5B,qBAAqB,EACrB,OAAO,EACR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAGrF,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAGtE,qBACa,YAAa,SAAQ,QAAQ;IACxC,IAAI,OAAO,0CAEV;IAED,SAAS,CACP,kBAAkB,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,MAAM,qBAAqB,EACnE,YAAY,CAAC,EAAE,oBAAoB;IAcrC,KAAK,CACH,kBAAkB,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,MAAM,qBAAqB,EACnE,YAAY,CAAC,EAAE,oBAAoB;IAKrC,UAAU,CAAC,MAAM,EAAE,MAAM,4BAA4B,GAAG,0BAA0B;IAW5E,eAAe,CAAC,MAAM,EAC1B,EAAE,EAAE,aAAa,CAAC,MAAM,CAAC,EACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,MAAM,qBAAqB,GAClE,OAAO,CAAC,MAAM,CAAC;IAOZ,QAAQ,CAAC,MAAM,EACnB,EAAE,EAAE,aAAa,CAAC,MAAM,CAAC,EACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,MAAM,qBAAqB,GAClE,OAAO,CAAC,MAAM,CAAC;CAWnB"}
+{"version":3,"file":"bean.database.d.ts","sourceRoot":"","sources":["../../src/bean/bean.database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,EAAE,QAAQ,EAA6B,MAAM,MAAM,CAAC;AAG3D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AACrF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,KAAK,EACV,4BAA4B,EAC5B,qBAAqB,EACrB,OAAO,EACR,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAGtE,qBACa,YAAa,SAAQ,QAAQ;IACxC,IAAI,OAAO,0CAEV;IAED,SAAS,CACP,kBAAkB,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,MAAM,qBAAqB,EACnE,YAAY,CAAC,EAAE,oBAAoB;IAcrC,KAAK,CACH,kBAAkB,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,MAAM,qBAAqB,EACnE,YAAY,CAAC,EAAE,oBAAoB;IAKrC,UAAU,CAAC,MAAM,EAAE,MAAM,4BAA4B,GAAG,0BAA0B;IAW5E,eAAe,CAAC,MAAM,EAC1B,EAAE,EAAE,aAAa,CAAC,MAAM,CAAC,EACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,MAAM,qBAAqB,GAClE,OAAO,CAAC,MAAM,CAAC;IAOZ,QAAQ,CAAC,MAAM,EACnB,EAAE,EAAE,aAAa,CAAC,MAAM,CAAC,EACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,MAAM,qBAAqB,GAClE,OAAO,CAAC,MAAM,CAAC;CAWnB"}

package/dist/index.js

@@ -2251,8 +2251,12 @@ let ServiceDatabaseDialectBase = class ServiceDatabaseDialectBase extends BeanBa
     if (this._columnTypePrefixes(type, TIMESTAMP_COLUMN_TYPE_PREFIXES) && value === 'CURRENT_TIMESTAMP') {
       return undefined; // new Date();
     }
-    if (this._columnTypePrefixes(type, FLOAT_COLUMN_TYPE_PREFIXES)) return this._safeNumber(value);
-    if (this._columnTypePrefixes(type, INTEGER_COLUMN_TYPE_PREFIXES)) return this._safeNumber(value);
+    if (this._columnTypePrefixes(type, FLOAT_COLUMN_TYPE_PREFIXES)) {
+      return this._safeNumber(value);
+    }
+    if (this._columnTypePrefixes(type, INTEGER_COLUMN_TYPE_PREFIXES)) {
+      return this._safeNumber(value);
+    }
     // pg: NULL::character varying
     if (value.indexOf('NULL::') === 0) return undefined;
     return value;
@@ -3874,6 +3878,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);