vona-module-a-orm 5.1.3 → 5.1.5

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/LICENSE CHANGED
File without changes
@@ -13,14 +13,14 @@ export declare class BeanDatabaseDialectBase extends BeanBase {
13
13
  createDatabase(_schemaBuilder: Knex.SchemaBuilder, _databaseName: string): Promise<string>;
14
14
  dropDatabase(_schemaBuilder: Knex.SchemaBuilder, _databaseName: string): Promise<void>;
15
15
  fetchIndexes(_schemaBuilder: Knex.SchemaBuilder, _tableName: string): Promise<IFetchIndexesResultItem[]>;
16
- insert(_builder: Knex.QueryBuilder, _datas: any[]): Promise<TableIdentity[]>;
16
+ insert(_builder: Knex.QueryBuilder, _datas: any[]): Promise<[TableIdentity[], Knex.QueryBuilder]>;
17
17
  select(_builder: Knex.QueryBuilder, datas: any[], _fn: TypeDatabaseDialectTableColumnsFn): Promise<any[]>;
18
18
  query(_result: any): void;
19
19
  viewDependents(_builder: Knex.QueryBuilder, _viewName: string): Promise<string[]>;
20
20
  coerceColumn(column: Knex.ColumnInfo): ITableColumn;
21
21
  protected selectAsSqlite3(_builder: Knex.QueryBuilder, datas: any[], fn: TypeDatabaseDialectTableColumnsFn): Promise<any[]>;
22
- protected insertAsMysql(builder: Knex.QueryBuilder, datas: any[]): Promise<TableIdentity[]>;
23
- protected insertAsPg(builder: Knex.QueryBuilder, datas: any[]): Promise<TableIdentity[]>;
22
+ protected insertAsMysql(builder: Knex.QueryBuilder, datas: any[]): Promise<[TableIdentity[], Knex.QueryBuilder]>;
23
+ protected insertAsPg(builder: Knex.QueryBuilder, datas: any[]): Promise<[TableIdentity[], Knex.QueryBuilder]>;
24
24
  protected _coerceColumnValue(type: string, value: any): any;
25
25
  protected _safeNumber(value: any): number | undefined;
26
26
  protected _columnTypePrefixes(type: string, prefixes: string[]): boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"bean.databaseDialectBase.d.ts","sourceRoot":"","sources":["../../src/bean/bean.databaseDialectBase.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAGpD,OAAO,EAAE,QAAQ,EAAW,MAAM,MAAM,CAAC;AAGzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,KAAK,EACV,4BAA4B,EAC5B,yBAAyB,EACzB,uBAAuB,EACvB,iCAAiC,EAClC,MAAM,qBAAqB,CAAC;AAE7B,qBAEa,uBAAwB,SAAQ,QAAQ;IACnD,SAAS,CAAC,aAAa,CAAC,EAAE,4BAA4B,CAAC;IACvD,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAEtD,IAAI,YAAY,iCAGf;IAED,IAAI,UAAU,8CAEb;IAEK,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,EAAE,CAAC;IAIjH,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1F,YAAY,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAItF,YAAY,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAIxG,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAI5E,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,iCAAiC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAI/G,KAAK,CAAC,OAAO,KAAA;IAIP,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAIvF,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,GAAG,YAAY;cASnC,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,iCAAiC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;cAmBjH,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;cAkBjF,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAa9F,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,KAAA;IAkBhD,SAAS,CAAC,WAAW,CAAC,KAAK,KAAA;IAK3B,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE;CAG/D"}
1
+ {"version":3,"file":"bean.databaseDialectBase.d.ts","sourceRoot":"","sources":["../../src/bean/bean.databaseDialectBase.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAGpD,OAAO,EAAE,QAAQ,EAAW,MAAM,MAAM,CAAC;AAGzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,KAAK,EACV,4BAA4B,EAC5B,yBAAyB,EACzB,uBAAuB,EACvB,iCAAiC,EAClC,MAAM,qBAAqB,CAAC;AAE7B,qBAEa,uBAAwB,SAAQ,QAAQ;IACnD,SAAS,CAAC,aAAa,CAAC,EAAE,4BAA4B,CAAC;IACvD,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAEtD,IAAI,YAAY,iCAGf;IAED,IAAI,UAAU,8CAEb;IAEK,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,EAAE,CAAC;IAIjH,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1F,YAAY,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAItF,YAAY,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAIxG,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAIjG,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,iCAAiC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAI/G,KAAK,CAAC,OAAO,KAAA;IAIP,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAIvF,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,GAAG,YAAY;cASnC,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,iCAAiC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;cAmBjH,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;cAoBtG,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAanH,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,KAAA;IAkBhD,SAAS,CAAC,WAAW,CAAC,KAAK,KAAA;IAK3B,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE;CAG/D"}
@@ -1 +1 @@
1
- {"version":3,"file":"bean.model_crud_inner.d.ts","sourceRoot":"","sources":["../../../src/bean/bean.model/bean.model_crud_inner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAKpD,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,EACrB,0BAA0B,EAC1B,yBAAyB,EACzB,kBAAkB,EAClB,0BAA0B,EAC1B,YAAY,EACZ,cAAc,EACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,qBAAa,kBAAkB,CAAC,OAAO,SAAS,EAAE,CAAE,SAAQ,aAAa,CAAC,OAAO,CAAC;cAChE,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,YAAY,EAAE,GAAG,CAAC,EAAE,aAAa,EAAE,EAAE,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAMxH,cAAc,CAC5B,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,GAAG,CAAC,EAAE,aAAa,EAAE,EACrB,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC,EAAE,CAAC;cA4BnB,OAAO,CAAC,CAAC,SAAS,kBAAkB,CAAC,OAAO,CAAC,EAC3D,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,MAAM,CAAC,EAAE,CAAC,EACV,OAAO,CAAC,EAAE,0BAA0B,EACpC,OAAO,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,GAC9C,OAAO,CAAC,OAAO,EAAE,CAAC;IAarB,SAAS,CAAC,mBAAmB,CAAC,CAAC,SAAS,yBAAyB,CAAC,OAAO,CAAC,EACxE,KAAK,EAAE,MAAM,YAAY,EACzB,MAAM,CAAC,EAAE,CAAC,EACV,OAAO,CAAC,EAAE,0BAA0B;cA4BtB,IAAI,CAClB,KAAK,EAAE,MAAM,YAAY,GAAG,SAAS,EACrC,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,EAC9B,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;cAgBf,MAAM,CACpB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,MAAM,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACnC,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;cAoBd,UAAU,CACxB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,EACvC,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,MAAM,CAAC;cAoBF,WAAW,CACzB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,EAC5C,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC;cAwCf,OAAO,CACrB,KAAK,EAAE,MAAM,YAAY,GAAG,SAAS,EACrC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EACtB,OAAO,CAAC,EAAE,0BAA0B,CAAC,OAAO,CAAC,GAC5C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;cAkCZ,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC;CAsB1I"}
1
+ {"version":3,"file":"bean.model_crud_inner.d.ts","sourceRoot":"","sources":["../../../src/bean/bean.model/bean.model_crud_inner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAKpD,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,EACrB,0BAA0B,EAC1B,yBAAyB,EACzB,kBAAkB,EAClB,0BAA0B,EAC1B,YAAY,EACZ,cAAc,EACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,qBAAa,kBAAkB,CAAC,OAAO,SAAS,EAAE,CAAE,SAAQ,aAAa,CAAC,OAAO,CAAC;cAChE,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,YAAY,EAAE,GAAG,CAAC,EAAE,aAAa,EAAE,EAAE,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAMxH,cAAc,CAC5B,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,GAAG,CAAC,EAAE,aAAa,EAAE,EACrB,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC,EAAE,CAAC;cA4BnB,OAAO,CAAC,CAAC,SAAS,kBAAkB,CAAC,OAAO,CAAC,EAC3D,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,MAAM,CAAC,EAAE,CAAC,EACV,OAAO,CAAC,EAAE,0BAA0B,EACpC,OAAO,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,GAC9C,OAAO,CAAC,OAAO,EAAE,CAAC;IAoBrB,SAAS,CAAC,mBAAmB,CAAC,CAAC,SAAS,yBAAyB,CAAC,OAAO,CAAC,EACxE,KAAK,EAAE,MAAM,YAAY,EACzB,MAAM,CAAC,EAAE,CAAC,EACV,OAAO,CAAC,EAAE,0BAA0B;cA4BtB,IAAI,CAClB,KAAK,EAAE,MAAM,YAAY,GAAG,SAAS,EACrC,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,EAC9B,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;cAgBf,MAAM,CACpB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,MAAM,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACnC,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;cAoBd,UAAU,CACxB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,EACvC,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,MAAM,CAAC;cAqBF,WAAW,CACzB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,EAC5C,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC;cAgDf,OAAO,CACrB,KAAK,EAAE,MAAM,YAAY,GAAG,SAAS,EACrC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EACtB,OAAO,CAAC,EAAE,0BAA0B,CAAC,OAAO,CAAC,GAC5C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;cAqCZ,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC;CAsB1I"}
@@ -36,5 +36,6 @@ export declare class BeanModelUtils<TRecord extends {}> extends BeanModelMeta<TR
36
36
  private _extractFirstValue;
37
37
  protected _prepareWhereByOptions(table: keyof ITableRecord, where: any, options?: IModelMethodOptionsGeneral): any;
38
38
  protected _prepareInsertDataByOptions(table: keyof ITableRecord, data: any, options?: IModelMethodOptionsGeneral): any;
39
+ protected _ellipsis‌Logger(str: string): string;
39
40
  }
40
41
  //# sourceMappingURL=bean.model_utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"bean.model_utils.d.ts","sourceRoot":"","sources":["../../../src/bean/bean.model/bean.model_utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bean.model_utils.d.ts","sourceRoot":"","sources":["../../../src/bean/bean.model/bean.model_utils.ts"],"names":[],"mappings":"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"}
@@ -46,5 +46,8 @@ export declare function config(_app: VonaApplication): {
46
46
  client: string;
47
47
  };
48
48
  };
49
+ logger: {
50
+ maxLength: number;
51
+ };
49
52
  };
50
53
  //# sourceMappingURL=config.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAI/D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAElE,wBAAgB,MAAM,CAAC,IAAI,EAAE,eAAe;;;;;;;;;;;;;;;;;;sBAmBZ,iBAAiB;;;;;;;;;;;;cAiBxC,uBAAuB;;;cAGd,iBAAiB;uBACH,kBAAkB;;;;;;;;;EAUjD"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAI/D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAElE,wBAAgB,MAAM,CAAC,IAAI,EAAE,eAAe;;;;;;;;;;;;;;;;;;sBAmBZ,iBAAiB;;;;;;;;;;;;cAiBxC,uBAAuB;;;cAGd,iBAAiB;uBACH,kBAAkB;;;;;;;;;;;;EAajD"}
package/dist/index.js CHANGED
@@ -835,32 +835,34 @@ let BeanDatabaseDialectBase = class BeanDatabaseDialectBase extends BeanBase {
835
835
  return datas;
836
836
  }
837
837
  async insertAsMysql(builder, datas) {
838
- if (datas.length === 0) return [];
838
+ if (datas.length === 0) return [[], builder];
839
839
  if (isNil(datas[0].id)) {
840
+ let builderFirst = undefined;
840
841
  const ids = [];
841
842
  for (const data of datas) {
842
843
  const builder2 = builder.clone();
843
844
  builder2.insert(data);
844
845
  const items = await builder2;
845
846
  ids.push(items[0]);
847
+ if (!builderFirst) builderFirst = builder2;
846
848
  }
847
- return ids;
849
+ return [ids, builderFirst ?? builder];
848
850
  } else {
849
851
  builder.insert(datas);
850
852
  await builder;
851
- return datas.map(item => item.id);
853
+ return [datas.map(item => item.id), builder];
852
854
  }
853
855
  }
854
856
  async insertAsPg(builder, datas) {
855
- if (datas.length === 0) return [];
857
+ if (datas.length === 0) return [[], builder];
856
858
  if (isNil(datas[0].id)) {
857
859
  builder.insert(datas).returning('id');
858
860
  const items = await builder;
859
- return items.map(item => item.id);
861
+ return [items.map(item => item.id), builder];
860
862
  } else {
861
863
  builder.insert(datas);
862
864
  await builder;
863
- return datas.map(item => item.id);
865
+ return [datas.map(item => item.id), builder];
864
866
  }
865
867
  }
866
868
  _coerceColumnValue(type, value) {
@@ -1639,6 +1641,13 @@ class BeanModelUtils extends BeanModelMeta {
1639
1641
  }
1640
1642
  return result;
1641
1643
  }
1644
+ _ellipsis‌Logger(str) {
1645
+ const maxLength = this.scopeOrm.config.logger.maxLength;
1646
+ if (str.length > maxLength) {
1647
+ str = str.substring(0, maxLength) + ' ...';
1648
+ }
1649
+ return str;
1650
+ }
1642
1651
  }
1643
1652
 
1644
1653
  class BeanModelKnex extends BeanModelUtils {
@@ -1853,10 +1862,17 @@ class BeanModelCrudInner extends BeanModelView {
1853
1862
  if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
1854
1863
  // builder
1855
1864
  builder = builder ?? this._select_buildParams(table, params, options);
1856
- // ready
1857
- this.$loggerChild('model').debug(() => `model.select: ${builder.toQuery()}`);
1858
1865
  // datas
1859
1866
  const datas = await builder;
1867
+ // debug
1868
+ this.$loggerChild('model').debug(() => {
1869
+ let tip = String(datas.length);
1870
+ const id = cast(datas[0])?.id;
1871
+ if (!isNil(id)) {
1872
+ tip = `${tip}/${id}`;
1873
+ }
1874
+ return `model.select: ${tip}, ${builder.toQuery()}`;
1875
+ });
1860
1876
  return await this.dialect.select(builder, datas, () => this.columns(table));
1861
1877
  }
1862
1878
  _select_buildParams(table, params, options) {
@@ -1937,8 +1953,9 @@ class BeanModelCrudInner extends BeanModelView {
1937
1953
  // where
1938
1954
  this.prepareWhere(builder, table, params.where, options);
1939
1955
  // ready
1940
- this.$loggerChild('model').debug(() => `model.increment: ${builder.toQuery()}`);
1941
1956
  const res = await builder;
1957
+ // debug
1958
+ this.$loggerChild('model').debug(() => `model.increment: ${res}, ${builder.toQuery()}`);
1942
1959
  return res;
1943
1960
  }
1944
1961
  async _insertBulk(table, data, options) {
@@ -1964,10 +1981,18 @@ class BeanModelCrudInner extends BeanModelView {
1964
1981
  }
1965
1982
  // builder
1966
1983
  const builder = this.builder(table);
1967
- // // debug
1968
- // this.$loggerChild('model').debug(() => `model.insert: ${builder.toQuery()}`);
1969
1984
  // dialect insert
1970
- const ids = await this.dialect.insert(builder, datas);
1985
+ const [ids, builder2] = await this.dialect.insert(builder, datas);
1986
+ // debug
1987
+ this.$loggerChild('model').debug(() => {
1988
+ let tip = String(ids.length);
1989
+ const id = ids[0];
1990
+ if (!isNil(id)) {
1991
+ tip = `${tip}/${id}`;
1992
+ }
1993
+ const query = this._ellipsis‌Logger(builder2.toQuery());
1994
+ return `model.insert: ${tip}, ${query}`;
1995
+ });
1971
1996
  // combine
1972
1997
  const result = [];
1973
1998
  const dataDefault = await this.defaultData(table);
@@ -2006,10 +2031,13 @@ class BeanModelCrudInner extends BeanModelView {
2006
2031
  builder.update(data);
2007
2032
  // where
2008
2033
  this.prepareWhere(builder, table, where, options);
2009
- // debug
2010
- this.$loggerChild('model').debug(() => `model.update: ${builder.toQuery()}`);
2011
2034
  // ready
2012
- await builder;
2035
+ const resCount = await builder;
2036
+ // debug
2037
+ this.$loggerChild('model').debug(() => {
2038
+ const query = this._ellipsis‌Logger(builder.toQuery());
2039
+ return `model.update: ${resCount}, ${query}`;
2040
+ });
2013
2041
  // ok
2014
2042
  return data;
2015
2043
  }
@@ -2034,10 +2062,10 @@ class BeanModelCrudInner extends BeanModelView {
2034
2062
  builder.delete();
2035
2063
  // where
2036
2064
  this.prepareWhere(builder, table, where, options);
2037
- // debug
2038
- this.$loggerChild('model').debug(() => `model.delete: ${builder.toQuery()}`);
2039
2065
  // ready
2040
- await builder;
2066
+ const resCount = await builder;
2067
+ // debug
2068
+ this.$loggerChild('model').debug(() => `model.delete: ${resCount}, ${builder.toQuery()}`);
2041
2069
  }
2042
2070
  }
2043
2071
 
@@ -3752,6 +3780,9 @@ function config(_app) {
3752
3780
  redis: {
3753
3781
  client: 'model'
3754
3782
  }
3783
+ },
3784
+ logger: {
3785
+ maxLength: 256
3755
3786
  }
3756
3787
  };
3757
3788
  }