fix: throw error when not connected in drivers (#7995)

this prevents a `cannot read property connect of undefined` error
typeorm · Jul 31, 2021 · cd71f62 · cd71f62
1 parent 69fabaf
commit cd71f62
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 3 deletions.
diff --git a/src/driver/cockroachdb/CockroachDriver.ts b/src/driver/cockroachdb/CockroachDriver.ts
@@ -619,6 +619,10 @@ export class CockroachDriver implements Driver {
      */
     obtainMasterConnection(): Promise<any> {
         return new Promise((ok, fail) => {
+            if (!this.master) {
+                return fail(new TypeORMError("Driver not Connected"));
+            }
+
             this.master.connect((err: any, connection: any, release: any) => {
                 err ? fail(err) : ok([connection, release]);
             });

diff --git a/src/driver/oracle/OracleDriver.ts b/src/driver/oracle/OracleDriver.ts
@@ -22,6 +22,7 @@ import {ReplicationMode} from "../types/ReplicationMode";
 import { Table } from "../../schema-builder/table/Table";
 import { View } from "../../schema-builder/view/View";
 import { TableForeignKey } from "../../schema-builder/table/TableForeignKey";
+import { TypeORMError } from "../../error";
 
 /**
  * Organizes communication with Oracle RDBMS.
@@ -623,6 +624,10 @@ export class OracleDriver implements Driver {
      */
     obtainMasterConnection(): Promise<any> {
         return new Promise<any>((ok, fail) => {
+            if (!this.master) {
+                return fail(new TypeORMError("Driver not Connected"));
+            }
+
             this.master.getConnection((err: any, connection: any, release: Function) => {
                 if (err) return fail(err);
                 ok(connection);

diff --git a/src/driver/postgres/PostgresDriver.ts b/src/driver/postgres/PostgresDriver.ts
@@ -910,6 +910,11 @@ export class PostgresDriver implements Driver {
      */
     obtainMasterConnection(): Promise<any> {
         return new Promise((ok, fail) => {
+            if (!this.master) {
+                fail(new TypeORMError("Driver not Connected"))
+                return;
+            }
+
             this.master.connect((err: any, connection: any, release: any) => {
                 err ? fail(err) : ok([connection, release]);
             });
@@ -921,9 +926,10 @@ export class PostgresDriver implements Driver {
      * Used for replication.
      * If replication is not setup then returns master (default) connection's database connection.
      */
-    obtainSlaveConnection(): Promise<any> {
-        if (!this.slaves.length)
+    async obtainSlaveConnection(): Promise<any> {
+        if (!this.slaves.length) {
             return this.obtainMasterConnection();
+        }
 
         return new Promise((ok, fail) => {
             const random = Math.floor(Math.random() * this.slaves.length);

diff --git a/src/driver/sap/SapDriver.ts b/src/driver/sap/SapDriver.ts
@@ -1,4 +1,13 @@
-import { ColumnType, Connection, EntityMetadata, ObjectLiteral, Table, TableColumn, TableForeignKey } from "../..";
+import {
+    ColumnType,
+    Connection,
+    EntityMetadata,
+    ObjectLiteral,
+    Table,
+    TableColumn,
+    TableForeignKey,
+    TypeORMError,
+} from "../..";
 import {DriverPackageNotInstalledError} from "../../error/DriverPackageNotInstalledError";
 import {ColumnMetadata} from "../../metadata/ColumnMetadata";
 import {PlatformTools} from "../../platform/PlatformTools";
@@ -600,6 +609,10 @@ export class SapDriver implements Driver {
      * If replication is not setup then returns default connection's database connection.
      */
     obtainMasterConnection(): Promise<any> {
+        if (!this.master) {
+            throw new TypeORMError("Driver not Connected");
+        }
+
         return this.master.getConnection();
     }
 

diff --git a/src/driver/sqlserver/SqlServerDriver.ts b/src/driver/sqlserver/SqlServerDriver.ts
@@ -23,6 +23,7 @@ import {ReplicationMode} from "../types/ReplicationMode";
 import { Table } from "../../schema-builder/table/Table";
 import { View } from "../../schema-builder/view/View";
 import { TableForeignKey } from "../../schema-builder/table/TableForeignKey";
+import { TypeORMError } from "../../error";
 
 /**
  * Organizes communication with SQL Server DBMS.
@@ -640,6 +641,10 @@ export class SqlServerDriver implements Driver {
      * If replication is not setup then returns default connection's database connection.
      */
     obtainMasterConnection(): Promise<any> {
+        if (!this.master) {
+            return Promise.reject(new TypeORMError("Driver not Connected"));
+        }
+
         return Promise.resolve(this.master);
     }