Skip to content

Commit

Permalink
fixed validationQuery, should not run validation sql when non-specifi…
Browse files Browse the repository at this point in the history
…c database
  • Loading branch information
WaBLin123 committed Sep 17, 2021
1 parent 05deb1d commit d09c155
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/initializers/typeorm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ export class TypeORMInitializer extends Initializer {
});

if (config.typeorm.type === "mysql") {
await connection.manager.query(`CREATE DATABASE IF NOT EXISTS ${dbName} CHARACTER SET ${config.typeorm.autoCreateDBOptions.charset} COLLATE ${config.typeorm.autoCreateDBOptions.collate};`)
await connection.manager.query(
`CREATE DATABASE IF NOT EXISTS ${dbName} CHARACTER SET ${config.typeorm.autoCreateDBOptions.charset} COLLATE ${config.typeorm.autoCreateDBOptions.collate};`
);
} else {
const queryRunner = connection.createQueryRunner();
await queryRunner.createDatabase(dbName, true);
Expand All @@ -65,7 +67,10 @@ export class TypeORMInitializer extends Initializer {
if (dialect === "oracle") {
sql = "SELECT 1 FROM DUAL";
}
const queryRunner = api.typeORM.connection.createQueryRunner();
await queryRunner.query(sql);
// should not run sql when sql is empty string(dialect is other database)
if (sql) {
const queryRunner = api.typeORM.connection.createQueryRunner();
await queryRunner.query(sql);
}
}
}

0 comments on commit d09c155

Please sign in to comment.