fix(schema): revert the dbName after dropping the database

Closes #5583
mikro-orm · May 18, 2024 · 725f7e9 · 725f7e9
1 parent 567d65a
commit 725f7e9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/packages/knex/src/query/ObjectCriteriaNode.ts b/packages/knex/src/query/ObjectCriteriaNode.ts
@@ -190,6 +190,7 @@ export class ObjectCriteriaNode<T extends object> extends CriteriaNode<T> {
       return;
     }
 
+    /* istanbul ignore next */
     if (key === '$and') {
       o.$and.push({ [key]: value });
       return;

diff --git a/packages/knex/src/schema/SqlSchemaGenerator.ts b/packages/knex/src/schema/SqlSchemaGenerator.ts
@@ -565,6 +565,7 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator<AbstractSqlDrive
     this.config.set('dbName', this.helper.getManagementDbName());
     await this.driver.reconnect();
     await this.execute(this.helper.getDropDatabaseSQL(name));
+    this.config.set('dbName', name);
   }
 
   override async execute(sql: string, options: { wrap?: boolean; ctx?: Transaction } = {}) {

diff --git a/tests/features/schema-generator/SchemaGenerator.mariadb.test.ts b/tests/features/schema-generator/SchemaGenerator.mariadb.test.ts
@@ -21,7 +21,7 @@ describe('SchemaGenerator', () => {
     await orm.schema.ensureDatabase();
     await orm.schema.dropDatabase(dbName);
     await orm.close(true);
-    await expect(orm.schema.ensureDatabase()).rejects.toThrow('Unable to acquire a connection');
+    await orm.schema.ensureDatabase();
   });
 
   test('create schema also creates the database if not exists [mariadb]', async () => {
@@ -39,7 +39,6 @@ describe('SchemaGenerator', () => {
     await orm.schema.createSchema();
     await orm.schema.dropSchema({ wrap: false, dropMigrationsTable: false, dropDb: true });
     await orm.close(true);
-    await expect(orm.schema.ensureDatabase()).rejects.toThrow('Unable to acquire a connection');
   });
 
   test('generate schema from metadata [mariadb]', async () => {