mirror of
https://github.com/typeorm/typeorm.git
synced 2025-12-08 21:26:23 +00:00
Merge branch 'master' into next
This commit is contained in:
commit
d8444fc3ed
1
.github/workflows/tests-linux.yml
vendored
1
.github/workflows/tests-linux.yml
vendored
@ -300,6 +300,7 @@ jobs:
|
||||
- run: npm ci
|
||||
- run: cat ormconfig.sample.json | jq 'map(select(.name == "oracle"))' > ormconfig.json
|
||||
- run: docker compose up oracle --no-recreate --wait
|
||||
- run: sleep 10
|
||||
- run: npx c8 npm run test:ci
|
||||
|
||||
- name: Coveralls Parallel
|
||||
|
||||
14
.pr_agent.toml
Normal file
14
.pr_agent.toml
Normal file
@ -0,0 +1,14 @@
|
||||
[github_app]
|
||||
pr_commands = [
|
||||
"/review",
|
||||
"/improve",
|
||||
]
|
||||
|
||||
handle_push_trigger = true
|
||||
push_commands = [
|
||||
"/improve",
|
||||
]
|
||||
|
||||
[auto_best_practices]
|
||||
enable_auto_best_practices = true
|
||||
utilize_auto_best_practices = true
|
||||
@ -73,7 +73,8 @@ export class PostgresDriver implements Driver {
|
||||
options: PostgresConnectionOptions
|
||||
|
||||
/**
|
||||
* Version of Postgres. Requires a SQL query to the DB, so it is not always set
|
||||
* Version of Postgres. Requires a SQL query to the DB, so it is set on the first
|
||||
* connection attempt.
|
||||
*/
|
||||
version?: string
|
||||
|
||||
@ -362,20 +363,24 @@ export class PostgresDriver implements Driver {
|
||||
this.master = await this.createPool(this.options, this.options)
|
||||
}
|
||||
|
||||
const queryRunner = this.createQueryRunner("master")
|
||||
if (!this.version || !this.database || !this.searchSchema) {
|
||||
const queryRunner = this.createQueryRunner("master")
|
||||
|
||||
this.version = await queryRunner.getVersion()
|
||||
if (!this.version) {
|
||||
this.version = await queryRunner.getVersion()
|
||||
}
|
||||
|
||||
if (!this.database) {
|
||||
this.database = await queryRunner.getCurrentDatabase()
|
||||
if (!this.database) {
|
||||
this.database = await queryRunner.getCurrentDatabase()
|
||||
}
|
||||
|
||||
if (!this.searchSchema) {
|
||||
this.searchSchema = await queryRunner.getCurrentSchema()
|
||||
}
|
||||
|
||||
await queryRunner.release()
|
||||
}
|
||||
|
||||
if (!this.searchSchema) {
|
||||
this.searchSchema = await queryRunner.getCurrentSchema()
|
||||
}
|
||||
|
||||
await queryRunner.release()
|
||||
|
||||
if (!this.schema) {
|
||||
this.schema = this.searchSchema
|
||||
}
|
||||
|
||||
@ -160,6 +160,10 @@ export { WhereExpression } from "./query-builder/WhereExpressionBuilder"
|
||||
export { InsertResult } from "./query-builder/result/InsertResult"
|
||||
export { UpdateResult } from "./query-builder/result/UpdateResult"
|
||||
export { DeleteResult } from "./query-builder/result/DeleteResult"
|
||||
export {
|
||||
QueryPartialEntity,
|
||||
QueryDeepPartialEntity,
|
||||
} from "./query-builder/QueryPartialEntity"
|
||||
export { QueryResult } from "./query-runner/QueryResult"
|
||||
export { QueryRunner } from "./query-runner/QueryRunner"
|
||||
export { MongoEntityManager } from "./entity-manager/MongoEntityManager"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user