@diyaner/egg-typeorm 2.6.4 → 3.0.1

package/README.md

@@ -1,4 +1,6 @@
-# egg-ts-template
+# egg-typeorm
+
+## 3.0 版本采用@ginreo/typeorm 替换typeorm，作为发布线
 
 [![NPM version][npm-image]][npm-url]
 [![build status][travis-image]][travis-url]

package/agent.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
-const typeorm = require("typeorm");
+const typeorm = require("@ginreo/typeorm");
 const loader_1 = require("./lib/loader");
 const connection_1 = require("./lib/connection");
 class EggTypeOrmAppBoot {
@@ -33,4 +33,4 @@ class EggTypeOrmAppBoot {
     }
 }
 exports.default = EggTypeOrmAppBoot;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWdlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJhZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLDRCQUEwQjtBQUMxQixtQ0FBbUM7QUFFbkMseUNBQXNDO0FBQ3RDLGlEQUF5RTtBQUV6RSxNQUFxQixpQkFBaUI7SUFFckMsWUFBWSxHQUFVO1FBQ3JCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2Ysb0NBQW9DO1FBQ3BDLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxHQUFHLEVBQVMsQ0FBQztZQUM3QixJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1lBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsR0FBRyxFQUFFLENBQUM7WUFDbEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsT0FBTyxHQUFHLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQztZQUM3RCxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsR0FBRyxxQ0FBd0IsQ0FBQztRQUN0RSxDQUFDO0lBQ0YsQ0FBQztJQUNELGFBQWEsS0FBVSxDQUFDO0lBRXhCLEtBQUssQ0FBQyxPQUFPLEtBQUksQ0FBQztJQUVsQixLQUFLLENBQUMsU0FBUztRQUNkLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ25DLElBQUEsZ0JBQVUsRUFBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDckIsTUFBTSxJQUFBLG9CQUFXLEVBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzdCLENBQUM7SUFDRixDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVc7UUFDaEIsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDbkMsS0FBSyxNQUFNLEVBQUUsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUM7Z0JBQzVELE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2xELENBQUM7UUFDRixDQUFDO0lBQ0YsQ0FBQztDQUNEO0FBL0JELG9DQStCQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWdlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJhZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLDRCQUEwQjtBQUMxQiwyQ0FBMkM7QUFFM0MseUNBQXNDO0FBQ3RDLGlEQUF5RTtBQUV6RSxNQUFxQixpQkFBaUI7SUFFckMsWUFBWSxHQUFVO1FBQ3JCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2Ysb0NBQW9DO1FBQ3BDLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxHQUFHLEVBQVMsQ0FBQztZQUM3QixJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1lBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsR0FBRyxFQUFFLENBQUM7WUFDbEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsT0FBTyxHQUFHLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQztZQUM3RCxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsR0FBRyxxQ0FBd0IsQ0FBQztRQUN0RSxDQUFDO0lBQ0YsQ0FBQztJQUNELGFBQWEsS0FBVSxDQUFDO0lBRXhCLEtBQUssQ0FBQyxPQUFPLEtBQUksQ0FBQztJQUVsQixLQUFLLENBQUMsU0FBUztRQUNkLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ25DLElBQUEsZ0JBQVUsRUFBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDckIsTUFBTSxJQUFBLG9CQUFXLEVBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzdCLENBQUM7SUFDRixDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVc7UUFDaEIsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDbkMsS0FBSyxNQUFNLEVBQUUsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUM7Z0JBQzVELE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2xELENBQUM7UUFDRixDQUFDO0lBQ0YsQ0FBQztDQUNEO0FBL0JELG9DQStCQyJ9

package/app.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
-const typeorm = require("typeorm");
-// import * as typeorm from "typeorm"
+const typeorm = require("@ginreo/typeorm");
 const loader_1 = require("./lib/loader");
 const connection_1 = require("./lib/connection");
 class EggTypeOrmAppBoot {
@@ -28,4 +27,4 @@ class EggTypeOrmAppBoot {
     }
 }
 exports.default = EggTypeOrmAppBoot;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsNEJBQTBCO0FBRTFCLG1DQUFtQztBQUVuQyxxQ0FBcUM7QUFDckMseUNBQXNDO0FBQ3RDLGlEQUF5RTtBQUV6RSxNQUFxQixpQkFBaUI7SUFFckMsWUFBWSxHQUFnQjtRQUMzQixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztRQUVmLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxHQUFHLEVBQVMsQ0FBQztRQUM3QixJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1FBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsR0FBRyxFQUFFLENBQUM7UUFDbEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsT0FBTyxHQUFHLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQztRQUM3RCxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsR0FBRyxxQ0FBd0IsQ0FBQztJQUN0RSxDQUFDO0lBQ0QsYUFBYSxLQUFVLENBQUM7SUFFeEIsS0FBSyxDQUFDLE9BQU8sS0FBSSxDQUFDO0lBRWxCLGlEQUFpRDtJQUNqRCxLQUFLLENBQUMsU0FBUztRQUNkLElBQUEsZ0JBQVUsRUFBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDckIsTUFBTSxJQUFBLG9CQUFXLEVBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzdCLENBQUM7SUFFRCxLQUFLLENBQUMsV0FBVztRQUNoQixLQUFLLE1BQU0sRUFBRSxJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQztZQUM1RCxNQUFNLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNsRCxDQUFDO0lBQ0YsQ0FBQztDQUNEO0FBMUJELG9DQTBCQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsNEJBQTBCO0FBRTFCLDJDQUEyQztBQUUzQyx5Q0FBc0M7QUFDdEMsaURBQXlFO0FBRXpFLE1BQXFCLGlCQUFpQjtJQUVyQyxZQUFZLEdBQWdCO1FBQzNCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBRWYsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEdBQUcsRUFBUyxDQUFDO1FBQzdCLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDbkMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxHQUFHLEVBQUUsQ0FBQztRQUNsQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsRUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQzdELElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLHdCQUF3QixHQUFHLHFDQUF3QixDQUFDO0lBQ3RFLENBQUM7SUFDRCxhQUFhLEtBQVUsQ0FBQztJQUV4QixLQUFLLENBQUMsT0FBTyxLQUFJLENBQUM7SUFFbEIsaURBQWlEO0lBQ2pELEtBQUssQ0FBQyxTQUFTO1FBQ2QsSUFBQSxnQkFBVSxFQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNyQixNQUFNLElBQUEsb0JBQVcsRUFBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDN0IsQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXO1FBQ2hCLEtBQUssTUFBTSxFQUFFLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDO1lBQzVELE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2xELENBQUM7SUFDRixDQUFDO0NBQ0Q7QUExQkQsb0NBMEJDIn0=

package/index.d.ts

@@ -8,7 +8,7 @@
  */
 
 import Egg from "egg";
-import * as typeorm from "typeorm";
+import * as typeorm from "@ginreo/typeorm";
 import { createTypeORMDataSources } from "./lib/connection";
 import { EggDataSource } from "./lib/EggDataSource";
 

package/lib/EggDataSource.d.ts

@@ -1,4 +1,4 @@
-import { DataSource, EntityTarget, ObjectLiteral, QueryRunner } from "typeorm";
+import { DataSource, EntityManager, EntityTarget, ObjectLiteral } from "@ginreo/typeorm";
 /**
  * custom extend typeorm's DataSource class
  */
@@ -33,8 +33,13 @@ export declare class EggDataSource extends DataSource {
     removeEntity<T extends Function>(clz: T): this;
     /** 通过用户表名或内部生成表名删除一个实体 仅限egg自定义添加的实体 */
     removeEntityByTableName(tableName: string): this;
-    /** query方法，支持查询语句转义 :params */
-    query2<T = any>(query: string, parameters: Record<string, any>, queryRunner?: QueryRunner): Promise<T>;
+    /** query方法增强
+     * - 支持查询语句转义 :params
+     * - 支持传入事务manager
+     */
+    query2<T = any>(query: string, parameters?: Record<string, any>, options?: {
+        manager?: EntityManager;
+    }): Promise<T>;
     /** 使用一个现有entity进行模型分表
      * - 注意，同一个分表entity不应反复调用，否则产生多个相同class，造成OOM
      * - 原始实体必须已经存在在datasource中，否则会报错

package/lib/EggDataSource.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EggDataSource = void 0;
 const tslib_1 = require("tslib");
-const typeorm_1 = require("typeorm");
-const ConnectionMetadataBuilder_1 = require("typeorm/connection/ConnectionMetadataBuilder");
-const EntityMetadataValidator_1 = require("typeorm/metadata-builder/EntityMetadataValidator");
-// import { ObjectUtils } from "typeorm/util/ObjectUtils";
+const typeorm_1 = require("@ginreo/typeorm");
+const ConnectionMetadataBuilder_1 = require("@ginreo/typeorm/connection/ConnectionMetadataBuilder");
+const EntityMetadataValidator_1 = require("@ginreo/typeorm/metadata-builder/EntityMetadataValidator");
+// import { ObjectUtils } from "@ginreo/typeorm/util/ObjectUtils";
 /**
  * custom extend typeorm's DataSource class
  */
@@ -154,10 +154,78 @@ class EggDataSource extends typeorm_1.DataSource {
         }
         return this;
     }
-    /** query方法，支持查询语句转义 :params */
-    async query2(query, parameters, queryRunner) {
-        const result = this.driver.escapeQueryWithParameters(query, parameters, {});
-        return await super.query(result[0], result[1], queryRunner);
+    // public query3<T>(
+    // 	query: string,
+    // 	parameters?: Record<string, any>,
+    // 	options?: {
+    // 		manager?: EntityManager;
+    // 		type: "select";
+    // 	}
+    // ): Promise<T[]>;
+    // public query3<T>(
+    // 	query: string,
+    // 	parameters?: Record<string, any>,
+    // 	options?: {
+    // 		manager?: EntityManager;
+    // 		type: "update";
+    // 	}
+    // ): Promise<number>;
+    // public query3<T>(
+    // 	query: string,
+    // 	parameters?: Record<string, any>,
+    // 	options?: {
+    // 		manager?: EntityManager;
+    // 		type: "delete";
+    // 	}
+    // ): Promise<number>;
+    // public query3<T>(
+    // 	query: string,
+    // 	parameters?: Record<string, any>,
+    // 	options?: {
+    // 		manager?: EntityManager;
+    // 		type: "insert";
+    // 	}
+    // ): Promise<any>;
+    // /** query方法增强
+    //  * - 支持查询语句转义 :params
+    //  * - 支持传入事务manager
+    //  * - 支持type定义结果类型 这个太复杂，暂时无法实现，底层driver差异很大，typeorm又没封装，可以借鉴sequelize。 */
+    // async query3<T = any>(
+    // 	query: string,
+    // 	parameters?: Record<string, any>,
+    // 	options?: {
+    // 		manager?: EntityManager;
+    // 		type?: "select" | "update" | "delete" | "insert";
+    // 	}
+    // ) {
+    // 	const [sql, params] = this.driver.escapeQueryWithParameters(query, parameters || {}, {});
+    // 	const queryRunner = options?.manager?.queryRunner || this.manager?.queryRunner;
+    // 	const result = await super.query(sql, params, queryRunner);
+    // 	if (options?.type === "select") {
+    // 		// eg. mysql multi select result
+    // 		// if (result[0] && Array.isArray(result[0])) {
+    // 		// 	return (result as any[][]).reduce((pre, next) => {
+    // 		// 		pre.push(...next);
+    // 		// 		return pre;
+    // 		// 	}, []) as T[];
+    // 		// }
+    // 		return result as T[]; // 如mysql支持多语句执行，每个语句结果都是一个数组，每个对象可能是不同的，需自行解析。
+    // 	}
+    // 	if (options?.type === "update") {
+    // 		return result as number;
+    // 	}
+    // 	return result as T;
+    // }
+    /** query方法增强
+     * - 支持查询语句转义 :params
+     * - 支持传入事务manager
+     */
+    async query2(query, parameters, options) {
+        var _a, _b;
+        const [sql, params] = this.driver.escapeQueryWithParameters(query, parameters || {}, {});
+        const queryRunner = ((_a = options === null || options === void 0 ? void 0 : options.manager) === null || _a === void 0 ? void 0 : _a.queryRunner) || ((_b = this.manager) === null || _b === void 0 ? void 0 : _b.queryRunner);
+        const result = await super.query2(sql, params, queryRunner);
+        return result;
     }
     /** 使用一个现有entity进行模型分表
      * - 注意，同一个分表entity不应反复调用，否则产生多个相同class，造成OOM
@@ -190,7 +258,7 @@ class EggDataSource extends typeorm_1.DataSource {
      * - 解决typeorm内部未处理Date, Json等类型的问题
      */
     createEntityInstance(EntityClass, plainObject) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         // const instance = this.manager.create(entityClass, plainObject);
         const instance = new EntityClass();
         const metadata = this.getMetadata(EntityClass);
@@ -263,6 +331,7 @@ class EggDataSource extends typeorm_1.DataSource {
                     instance[column.propertyName] = value;
                 }
                 else if (column.type === "string" ||
+                    column.type === "date" ||
                     column.type === String ||
                     ((_b = (_a = column.type) === null || _a === void 0 ? void 0 : _a.toString()) === null || _b === void 0 ? void 0 : _b.includes("char")) ||
                     ((_d = (_c = column.type) === null || _c === void 0 ? void 0 : _c.toString()) === null || _d === void 0 ? void 0 : _d.includes("text")) ||
@@ -272,23 +341,21 @@ class EggDataSource extends typeorm_1.DataSource {
                     }
                 }
                 else if (column.relationMetadata) {
-                    const relationMetadata = column.relationMetadata;
-                    // console.log(column.relationMetadata.propertyName);
-                    // console.log(column.relationMetadata.relationType);
-                    const value = plainObject[relationMetadata.propertyName];
-                    if (!value)
-                        continue;
-                    const relationType = relationMetadata.relationType;
-                    if (relationType === "one-to-one" || relationType === "many-to-one") {
-                        // @ts-ignore
-                        instance[relationMetadata.propertyName] = this.createEntityInstance(relationMetadata.type, value);
-                    }
-                    else if (relationType === "one-to-many" || relationType === "many-to-many") {
-                        // @ts-ignore
-                        instance[relationMetadata.propertyName] = value === null || value === void 0 ? void 0 : value.map((item) => {
-                            return this.createEntityInstance(relationMetadata.type, item);
-                        });
-                    }
+                    // const relationMetadata = column.relationMetadata;
+                    // // console.log(column.relationMetadata.propertyName);
+                    // // console.log(column.relationMetadata.relationType);
+                    // const value = plainObject[relationMetadata.propertyName];
+                    // if (!value) continue;
+                    // const relationType = relationMetadata.relationType;
+                    // if (relationType === "one-to-one" || relationType === "many-to-one") {
+                    // 	// @ts-ignore
+                    // 	instance[relationMetadata.propertyName] = this.createEntityInstance(relationMetadata.type, value);
+                    // } else if (relationType === "one-to-many" || relationType === "many-to-many") {
+                    // 	// @ts-ignore
+                    // 	instance[relationMetadata.propertyName] = value?.map((item: any) => {
+                    // 		return this.createEntityInstance(relationMetadata.type, item);
+                    // 	});
+                    // }
                 }
                 else {
                     if (plainObject[column.propertyName] !== undefined) {
@@ -297,8 +364,22 @@ class EggDataSource extends typeorm_1.DataSource {
                 }
             }
         }
+        (_g = metadata.manyToOneRelations) === null || _g === void 0 ? void 0 : _g.forEach((relation) => {
+            const value = plainObject[relation.propertyName];
+            if (value) {
+                // @ts-ignore
+                instance[relation.propertyName] = this.createEntityInstance(relation.type, value);
+            }
+        });
+        (_h = metadata.oneToOneRelations) === null || _h === void 0 ? void 0 : _h.forEach((relation) => {
+            const value = plainObject[relation.propertyName];
+            if (value) {
+                // @ts-ignore
+                instance[relation.propertyName] = this.createEntityInstance(relation.type, value);
+            }
+        });
         // 一对多关系处理
-        (_g = metadata.oneToManyRelations) === null || _g === void 0 ? void 0 : _g.forEach((relation) => {
+        (_j = metadata.oneToManyRelations) === null || _j === void 0 ? void 0 : _j.forEach((relation) => {
             const value = plainObject[relation.propertyName];
             if (Array.isArray(value)) {
                 // @ts-ignore
@@ -308,7 +389,7 @@ class EggDataSource extends typeorm_1.DataSource {
             }
         });
         // 多对多关系处理
-        (_h = metadata.manyToManyRelations) === null || _h === void 0 ? void 0 : _h.forEach((relation) => {
+        (_k = metadata.manyToManyRelations) === null || _k === void 0 ? void 0 : _k.forEach((relation) => {
             const value = plainObject[relation.propertyName];
             if (Array.isArray(value)) {
                 // @ts-ignore
@@ -321,4 +402,4 @@ class EggDataSource extends typeorm_1.DataSource {
     }
 }
 exports.EggDataSource = EggDataSource;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"EggDataSource.js","sourceRoot":"","sources":["EggDataSource.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"EggDataSource.js","sourceRoot":"","sources":["EggDataSource.ts"],"names":[],"mappings":"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"}

package/lib/Logger.d.ts

@@ -1,5 +1,5 @@
 import { Agent, Application } from "egg";
-import { Logger, QueryRunner } from "typeorm";
+import { Logger, QueryRunner } from "@ginreo/typeorm";
 export default class EggTypeORMLogger implements Logger {
     private app;
     constructor(app: Application | Agent);

package/lib/connection.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTypeORMDataSources = void 0;
+exports.default = default_1;
+exports.createTypeORMDataSources = createTypeORMDataSources;
 const util = require("util");
 const Logger_1 = require("./Logger");
 const assert = require("assert");
@@ -52,7 +53,6 @@ async function default_1(app) {
         }
     }
 }
-exports.default = default_1;
 async function createTypeORMDataSources(app, datasourcesConfig, entities) {
     // 留个外部可自定义logger的窗口app.typeorm.Logger
     const Logger = app.typeorm.Logger || Logger_1.default;
@@ -77,5 +77,4 @@ async function createTypeORMDataSources(app, datasourcesConfig, entities) {
     }
     throw new Error(util.format(`[Egg-TypeORM] the DB %s %s %s init connection was failed after retry 3 times.`, datasourcesConfig.host, datasourcesConfig.port, datasourcesConfig.name));
 }
-exports.createTypeORMDataSources = createTypeORMDataSources;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbm5lY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsNkJBQTRCO0FBRzVCLHFDQUF3QztBQUN4QyxpQ0FBaUM7QUFDakMsbURBQWdEO0FBQ2hEOzs7R0FHRztBQUNZLEtBQUssb0JBQVcsR0FBd0I7SUFDdEQsTUFBTSxRQUFRLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7SUFDckMsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDO0lBRTlDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsNkRBQTZELENBQUMsQ0FBQztJQUU1RixJQUFJLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDdkIsMEJBQTBCO1FBQzFCLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDOUIsSUFBSSxhQUFhLEdBQUcsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMscUJBQXFCO1lBQ3RFLE1BQU0sQ0FBQyxFQUFFLENBQUMsYUFBYSxFQUFFLDRFQUE2RSxJQUFZLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUUzSCxhQUFhLEdBQUcsYUFBYSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQyxzQ0FBc0M7WUFDMUcsNkJBQTZCO1lBQzdCLElBQUksQ0FBQyxRQUFRLEdBQUcsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQzFELGtCQUFrQjtZQUNsQixJQUFJLEtBQUssS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDakIsYUFBYTtnQkFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbm5lY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFXQSw0QkE2Q0M7QUFFRCw0REEyQ0M7QUFwR0QsNkJBQTRCO0FBRzVCLHFDQUF3QztBQUN4QyxpQ0FBaUM7QUFDakMsbURBQWdEO0FBQ2hEOzs7R0FHRztBQUNZLEtBQUssb0JBQVcsR0FBd0I7SUFDdEQsTUFBTSxRQUFRLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7SUFDckMsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDO0lBRTlDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsNkRBQTZELENBQUMsQ0FBQztJQUU1RixJQUFJLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDdkIsMEJBQTBCO1FBQzFCLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDOUIsSUFBSSxhQUFhLEdBQUcsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMscUJBQXFCO1lBQ3RFLE1BQU0sQ0FBQyxFQUFFLENBQUMsYUFBYSxFQUFFLDRFQUE2RSxJQUFZLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUUzSCxhQUFhLEdBQUcsYUFBYSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQyxzQ0FBc0M7WUFDMUcsNkJBQTZCO1lBQzdCLElBQUksQ0FBQyxRQUFRLEdBQUcsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQzFELGtCQUFrQjtZQUNsQixJQUFJLEtBQUssS0FBSyxDQUFDLEVB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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diyaner/egg-typeorm",
-  "version": "2.6.4",
+  "version": "3.0.1",
   "description": "egg plugin for nodejs orm freamwork typeorm.",
   "eggPlugin": {
     "name": "typeorm"
@@ -13,8 +13,8 @@
     "typeorm"
   ],
   "dependencies": {
-    "reflect-metadata": "^0.1.14",
-    "typeorm": "^0.3.25"
+    "@ginreo/typeorm": "^0.3.29",
+    "reflect-metadata": "^0.1.14"
   },
   "devDependencies": {
     "@types/mocha": "^8.2.1",
@@ -26,6 +26,7 @@
     "egg-mock": "^5.15.2",
     "eslint": "^5.13.0",
     "eslint-config-egg": "^7.1.0",
+    "mssql": "^12.2.0",
     "mysql2": "^3.9.7",
     "typescript": "^5.4.5"
   },

package/typeorm.d.ts

@@ -1,4 +1,4 @@
-export * from "typeorm";
+export * from "@ginreo/typeorm";
 export { EggDataSource } from "./lib/EggDataSource";
 import EggTypeORMLogger from "./lib/Logger";
 export { EggTypeORMLogger };

package/typeorm.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EggTypeORMLogger = exports.EggDataSource = void 0;
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("typeorm"), exports);
+tslib_1.__exportStar(require("@ginreo/typeorm"), exports);
 var EggDataSource_1 = require("./lib/EggDataSource");
 Object.defineProperty(exports, "EggDataSource", { enumerable: true, get: function () { return EggDataSource_1.EggDataSource; } });
 const Logger_1 = require("./lib/Logger");
 exports.EggTypeORMLogger = Logger_1.default;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZW9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInR5cGVvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUNBLGtEQUF1QjtBQUN2QixxREFBbUQ7QUFBMUMsOEdBQUEsYUFBYSxPQUFBO0FBQ3RCLHlDQUEyQztBQUNsQywyQkFERixnQkFBZ0IsQ0FDRSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZW9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInR5cGVvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUNBLDBEQUErQjtBQUMvQixxREFBbUQ7QUFBMUMsOEdBQUEsYUFBYSxPQUFBO0FBQ3RCLHlDQUEyQztBQUNsQywyQkFERixnQkFBZ0IsQ0FDRSJ9