.
This commit is contained in:
parent
50eb5e26f5
commit
02dab64d62
@ -28,9 +28,7 @@ export class SequelizeAdapter implements ISequelizeAdapter {
|
|||||||
// eslint-disable-next-line no-use-before-define
|
// eslint-disable-next-line no-use-before-define
|
||||||
private static instance: SequelizeAdapter;
|
private static instance: SequelizeAdapter;
|
||||||
|
|
||||||
public static getInstance(params: {
|
public static getInstance(params: { queryBuilder: ISequelizeQueryBuilder }): SequelizeAdapter {
|
||||||
queryBuilder: ISequelizeQueryBuilder;
|
|
||||||
}): SequelizeAdapter {
|
|
||||||
if (!SequelizeAdapter.instance) {
|
if (!SequelizeAdapter.instance) {
|
||||||
SequelizeAdapter.instance = SequelizeAdapter.create(params);
|
SequelizeAdapter.instance = SequelizeAdapter.create(params);
|
||||||
}
|
}
|
||||||
@ -54,7 +52,7 @@ export class SequelizeAdapter implements ISequelizeAdapter {
|
|||||||
protected constructor(
|
protected constructor(
|
||||||
connection: Sequelize,
|
connection: Sequelize,
|
||||||
models: ISequelizeModels,
|
models: ISequelizeModels,
|
||||||
queryBuilder: ISequelizeQueryBuilder,
|
queryBuilder: ISequelizeQueryBuilder
|
||||||
) {
|
) {
|
||||||
this._connection = connection;
|
this._connection = connection;
|
||||||
this._models = models;
|
this._models = models;
|
||||||
@ -79,7 +77,7 @@ export class SequelizeAdapter implements ISequelizeAdapter {
|
|||||||
}
|
}
|
||||||
throw InfrastructureError.create(
|
throw InfrastructureError.create(
|
||||||
InfrastructureError.RESOURCE_NOT_FOUND_ERROR,
|
InfrastructureError.RESOURCE_NOT_FOUND_ERROR,
|
||||||
`[SequelizeAdapter] ${modelName} sequelize model not exists!`,
|
`[SequelizeAdapter] ${modelName} sequelize model not exists!`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -111,7 +109,7 @@ function initConnection(): Sequelize {
|
|||||||
idle: 10000,
|
idle: 10000,
|
||||||
},
|
},
|
||||||
logQueryParameters: true,
|
logQueryParameters: true,
|
||||||
logging: (sql, timing) => console.debug(sql), //logger.debug(sql, timing),
|
logging: (sql, timing) => logger.debug(sql, timing),
|
||||||
|
|
||||||
define: {
|
define: {
|
||||||
charset: "utf8mb4",
|
charset: "utf8mb4",
|
||||||
@ -140,8 +138,7 @@ function registerModels(connection: Sequelize): ISequelizeModels {
|
|||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
||||||
const modelDef = require(path.join(file)).default;
|
const modelDef = require(path.join(file)).default;
|
||||||
const model =
|
const model = typeof modelDef === "function" ? modelDef(connection, DataTypes) : false;
|
||||||
typeof modelDef === "function" ? modelDef(connection, DataTypes) : false;
|
|
||||||
if (model) models[model.name] = model;
|
if (model) models[model.name] = model;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user