fix: improve async calls on disconnect (#11523)

alumni · web-flow · commit ead4f98ee4cb · 2025-06-19T00:43:38.000+02:00
diff --git a/package.json b/package.json
@@ -88,6 +88,7 @@
     "test": "npm run compile && npm run test:fast --",
     "test:ci": "mocha --bail",
     "test:fast": "mocha",
+    "typecheck": "tsc --noEmit",
     "watch": "tsc --watch"
   },
   "dependencies": {
diff --git a/sample/playground/package-lock.json b/sample/playground/package-lock.json
diff --git a/sample/playground/package.json b/sample/playground/package.json
@@ -12,11 +12,11 @@
     "reflect-metadata": "^0.2.2",
     "sql.js": "^1.13.0",
     "ts-node": "^10.9.2",
-    "typeorm": "0.3.22"
+    "typeorm": "*"
   },
   "devDependencies": {
-    "@types/node": "^20.11.24",
+    "@types/node": "^20.19.0",
     "@types/sql.js": "^1.4.9",
-    "typescript": "^5.3.3"
+    "typescript": "^5.8.3"
   }
 }
diff --git a/src/driver/cockroachdb/CockroachDriver.ts b/src/driver/cockroachdb/CockroachDriver.ts
@@ -346,8 +346,9 @@ export class CockroachDriver implements Driver {
      * Closes connection with database.
      */
     async disconnect(): Promise<void> {
-        if (!this.master)
-            return Promise.reject(new ConnectionIsNotSetError("cockroachdb"))
+        if (!this.master) {
+            throw new ConnectionIsNotSetError("cockroachdb")
+        }
 
         await this.closePool(this.master)
         await Promise.all(this.slaves.map((slave) => this.closePool(slave)))
diff --git a/src/driver/mongodb/MongoDriver.ts b/src/driver/mongodb/MongoDriver.ts
@@ -260,11 +260,13 @@ export class MongoDriver implements Driver {
      * Closes connection with the database.
      */
     async disconnect(): Promise<void> {
-        if (!this.queryRunner) throw new ConnectionIsNotSetError("mongodb")
-        // const handler = (err: any) => (err ? fail(err) : ok())
-        this.queryRunner.databaseConnection.close()
+        const queryRunner = this.queryRunner
+        if (!queryRunner) {
+            throw new ConnectionIsNotSetError("mongodb")
+        }
+
         this.queryRunner = undefined
-        // return ok()
+        await queryRunner.databaseConnection.close()
     }
 
     /**
diff --git a/src/driver/mysql/MysqlDriver.ts b/src/driver/mysql/MysqlDriver.ts
@@ -445,8 +445,9 @@ export class MysqlDriver implements Driver {
      * Closes connection with the database.
      */
     async disconnect(): Promise<void> {
-        if (!this.poolCluster && !this.pool)
-            return Promise.reject(new ConnectionIsNotSetError("mysql"))
+        if (!this.poolCluster && !this.pool) {
+            throw new ConnectionIsNotSetError("mysql")
+        }
 
         if (this.poolCluster) {
             return new Promise<void>((ok, fail) => {
diff --git a/src/driver/oracle/OracleDriver.ts b/src/driver/oracle/OracleDriver.ts
@@ -343,8 +343,9 @@ export class OracleDriver implements Driver {
      * Closes connection with the database.
      */
     async disconnect(): Promise<void> {
-        if (!this.master)
-            return Promise.reject(new ConnectionIsNotSetError("oracle"))
+        if (!this.master) {
+            throw new ConnectionIsNotSetError("oracle")
+        }
 
         await this.closePool(this.master)
         await Promise.all(this.slaves.map((slave) => this.closePool(slave)))
diff --git a/src/driver/postgres/PostgresDriver.ts b/src/driver/postgres/PostgresDriver.ts
@@ -585,8 +585,9 @@ export class PostgresDriver implements Driver {
      * Closes connection with database.
      */
     async disconnect(): Promise<void> {
-        if (!this.master)
-            return Promise.reject(new ConnectionIsNotSetError("postgres"))
+        if (!this.master) {
+            throw new ConnectionIsNotSetError("postgres")
+        }
 
         await this.closePool(this.master)
         await Promise.all(this.slaves.map((slave) => this.closePool(slave)))
diff --git a/src/driver/sap/SapDriver.ts b/src/driver/sap/SapDriver.ts
@@ -1,5 +1,6 @@
 import {
     ColumnType,
+    ConnectionIsNotSetError,
     DataSource,
     EntityMetadata,
     ObjectLiteral,
@@ -324,9 +325,13 @@ export class SapDriver implements Driver {
      * Closes connection with the database.
      */
     async disconnect(): Promise<void> {
-        const promise = this.master.clear()
+        const pool = this.master
+        if (!pool) {
+            throw new ConnectionIsNotSetError("sap")
+        }
+
         this.master = undefined
-        return promise
+        await pool.clear()
     }
 
     /**
diff --git a/src/driver/sqlserver/SqlServerDriver.ts b/src/driver/sqlserver/SqlServerDriver.ts
@@ -330,9 +330,9 @@ export class SqlServerDriver implements Driver {
      * Closes connection with the database.
      */
     async disconnect(): Promise<void> {
-        if (!this.master)
-            return Promise.reject(new ConnectionIsNotSetError("mssql"))
-
+        if (!this.master) {
+            throw new ConnectionIsNotSetError("mssql")
+        }
         await this.closePool(this.master)
         await Promise.all(this.slaves.map((slave) => this.closePool(slave)))
         this.master = undefined
diff --git a/test/functional/driver/mysql/connection-options/enable-query-timeout.ts b/test/functional/driver/mysql/connection-options/enable-query-timeout.ts
@@ -8,7 +8,7 @@ import {
     reloadTestingDatabases,
 } from "../../../../utils/test-utils"
 
-describe("mysql driver > enableQueryTimeout connection option", () => {
+describe("driver > mysql > connection options > enableQueryTimeout", () => {
     let dataSources: DataSource[]
     const commonConnectionOptions: TestingOptions = {
         entities: [__dirname + "/entity/*{.js,.ts}"],
@@ -34,16 +34,13 @@ describe("mysql driver > enableQueryTimeout connection option", () => {
         beforeEach(() => reloadTestingDatabases(dataSources))
         after(() => closeTestingConnections(dataSources))
 
-        it("should throw a query execution timeout error for the query when it exceeds the maxQueryExecutionTime", async () => {
-            await Promise.all(
+        it("should throw a query execution timeout error for the query when it exceeds the maxQueryExecutionTime", () =>
+            Promise.all(
                 dataSources.map(async (dataSource) => {
-                    let errorThrown = false
-                    try {
-                        await dataSource.manager.query(
-                            `SELECT SLEEP(${longQueryTimeSec})`,
-                        )
-                    } catch (err) {
-                        errorThrown = true
+                    await expect(
+                        dataSource.manager
+                            .sql`SELECT SLEEP(${longQueryTimeSec})`,
+                    ).to.eventually.be.rejected.then((err) => {
                         expect(err).to.have.nested.property(
                             "driverError.code",
                             "PROTOCOL_SEQUENCE_TIMEOUT",
@@ -52,27 +49,19 @@ describe("mysql driver > enableQueryTimeout connection option", () => {
                             "driverError.timeout",
                             timeoutMs,
                         )
-                    }
-                    expect(errorThrown).to.be.true
+                    })
                 }),
-            )
-        })
+            ))
 
-        it("should not throw a query execution timeout error for the query when it runs within the maxQueryExecutionTime", async () => {
-            await Promise.all(
+        it("should not throw a query execution timeout error for the query when it runs within the maxQueryExecutionTime", async () =>
+            Promise.all(
                 dataSources.map(async (dataSource) => {
-                    let errorThrown = false
-                    try {
-                        await dataSource.manager.query(
-                            `SELECT SLEEP(${shortQueryTimeSec})`,
-                        )
-                    } catch (err) {
-                        errorThrown = true
-                    }
-                    expect(errorThrown).to.be.false
+                    await expect(
+                        dataSource.manager
+                            .sql`SELECT SLEEP(${shortQueryTimeSec})`,
+                    ).to.eventually.be.fulfilled
                 }),
-            )
-        })
+            ))
     })
 
     describe("when enableQueryTimeout is not provided", () => {
@@ -87,20 +76,14 @@ describe("mysql driver > enableQueryTimeout connection option", () => {
 
         after(() => closeTestingConnections(datasources))
 
-        it("should not throw a query execution timeout error", () => {
+        it("should not throw a query execution timeout error", () =>
             Promise.all(
                 datasources.map(async (dataSource) => {
-                    let errorThrown = false
-                    try {
-                        await dataSource.manager.query(
-                            `SELECT SLEEP(${longQueryTimeSec})`,
-                        )
-                    } catch (err) {
-                        errorThrown = true
-                    }
-                    expect(errorThrown).to.be.false
+                    await expect(
+                        dataSource.manager
+                            .sql`SELECT SLEEP(${longQueryTimeSec})`,
+                    ).to.eventually.be.fulfilled
                 }),
-            )
-        })
+            ))
     })
 })
diff --git a/test/functional/driver/postgres/connection-options.ts b/test/functional/driver/postgres/connection-options.ts
@@ -7,7 +7,7 @@ import {
 import { DataSource } from "../../../../src/data-source/DataSource"
 import { expect } from "chai"
 
-describe("postgres specific options", () => {
+describe("driver > postgres > connection options", () => {
     let connections: DataSource[]
     before(
         async () =>
@@ -21,7 +21,7 @@ describe("postgres specific options", () => {
     beforeEach(() => reloadTestingDatabases(connections))
     after(() => closeTestingConnections(connections))
 
-    it("should set application_name", () =>
+    it("should set session variable application_name", () =>
         Promise.all(
             connections.map(async (connection) => {
                 const result = await connection.query(
diff --git a/test/functional/query-builder/convert-to-entity/convert-to-entity.ts b/test/functional/query-builder/convert-to-entity/convert-to-entity.ts
@@ -8,7 +8,7 @@ import {
 import { DataSource } from "../../../../src/data-source/DataSource"
 import { Post } from "./entity/Post"
 
-describe("driver > convert raw results to entity", () => {
+describe("query builder > convert raw results to entity", () => {
     let connections: DataSource[]
     before(
         async () =>
diff --git a/test/functional/query-builder/convert-to-entity/entity/Post.ts b/test/functional/query-builder/convert-to-entity/entity/Post.ts
diff --git a/test/github-issues/320/issue-320.ts b/test/github-issues/320/issue-320.ts
@@ -1,10 +1,11 @@
+import { expect } from "chai"
 import "reflect-metadata"
+import { DataSource } from "../../../src/data-source/DataSource"
 import {
     closeTestingConnections,
     createTestingConnections,
     reloadTestingDatabases,
 } from "../../utils/test-utils"
-import { DataSource } from "../../../src/data-source/DataSource"
 import { ActivityEntity } from "./entity/ActivityEntity"
 
 describe("github issues > #320 Bug in getManyAndCount", () => {
@@ -51,7 +52,7 @@ describe("github issues > #320 Bug in getManyAndCount", () => {
                     .setParameter("tiles", tiles)
                     .setParameter("tileCount", tiles.length)
 
-                await query.getMany
+                await expect(query.getMany()).to.eventually.be.fulfilled
             }),
         ))
 })
