fix: some drivers set the wrong database name when defined from url (#…

…8058) the `Driver.database` was getting set only from the options and completely ignored the connection URLs being passed to them. this meant that in some cases the migrations would apply to the wrong database or schema if connection url strings were used
typeorm · Aug 10, 2021 · a3a3284 · a3a3284
1 parent 65cbcc7
commit a3a3284
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 12 deletions.
diff --git a/src/driver/cockroachdb/CockroachDriver.ts b/src/driver/cockroachdb/CockroachDriver.ts
@@ -253,11 +253,9 @@ export class CockroachDriver implements Driver {
                 return this.createPool(this.options, slave);
             }));
             this.master = await this.createPool(this.options, this.options.replication.master);
-            this.database = this.options.replication.master.database;
 
         } else {
             this.master = await this.createPool(this.options, this.options);
-            this.database = this.options.database;
         }
     }
 

diff --git a/src/driver/oracle/OracleDriver.ts b/src/driver/oracle/OracleDriver.ts
@@ -256,11 +256,8 @@ export class OracleDriver implements Driver {
                 return this.createPool(this.options, slave);
             }));
             this.master = await this.createPool(this.options, this.options.replication.master);
-            this.database = this.options.replication.master.database;
-
         } else {
             this.master = await this.createPool(this.options, this.options);
-            this.database = this.options.database;
         }
     }
 

diff --git a/src/driver/postgres/PostgresDriver.ts b/src/driver/postgres/PostgresDriver.ts
@@ -297,11 +297,8 @@ export class PostgresDriver implements Driver {
                 return this.createPool(this.options, slave);
             }));
             this.master = await this.createPool(this.options, this.options.replication.master);
-            this.database = this.options.replication.master.database;
-
         } else {
             this.master = await this.createPool(this.options, this.options);
-            this.database = this.options.database;
         }
     }
 

diff --git a/src/driver/sap/SapDriver.ts b/src/driver/sap/SapDriver.ts
@@ -257,8 +257,6 @@ export class SapDriver implements Driver {
 
         // create the pool
         this.master = this.client.createPool(dbParams, options);
-
-        this.database = this.options.database;
     }
 
     /**

diff --git a/src/driver/sqlserver/SqlServerDriver.ts b/src/driver/sqlserver/SqlServerDriver.ts
@@ -254,11 +254,9 @@ export class SqlServerDriver implements Driver {
                 return this.createPool(this.options, slave);
             }));
             this.master = await this.createPool(this.options, this.options.replication.master);
-            this.database = this.options.replication.master.database;
 
         } else {
             this.master = await this.createPool(this.options, this.options);
-            this.database = this.options.database;
         }
     }