@mikro-orm/oracledb 7.1.9-dev.1 → 7.1.9-dev.2

package/OracleSchemaGenerator.d.ts

@@ -11,7 +11,13 @@ export declare class OracleSchemaGenerator extends SchemaGenerator {
     /**
      * creates new database and connects to it
      */
-    createDatabase(name?: string): Promise<void>;
+    createDatabase(name?: string, options?: {
+        skipOnConnect?: boolean;
+    }): Promise<void>;
+    /**
+     * Drops the user representing the database. When dropping the user we are connected as, we stay
+     * connected as the management user, as the dropped one can no longer authenticate.
+     */
     dropDatabase(name?: string): Promise<void>;
     /**
      * Oracle uses CASCADE CONSTRAINT in DROP TABLE and has no native enums,

package/OracleSchemaGenerator.js

@@ -9,7 +9,7 @@ export class OracleSchemaGenerator extends SchemaGenerator {
     /**
      * creates new database and connects to it
      */
-    async createDatabase(name) {
+    async createDatabase(name, options) {
         name ??= this.config.get('user');
         /* v8 ignore next: tableSpace fallback */
         const tableSpace = this.config.get('schemaGenerator').tableSpace ?? 'mikro_orm';
@@ -31,14 +31,24 @@ export class OracleSchemaGenerator extends SchemaGenerator {
         await this.execute(sql);
         await this.execute(`grant connect, resource to ${this.platform.quoteIdentifier(name)}`);
         this.config.set('user', name);
-        await this.driver.reconnect();
+        await this.driver.reconnect(options);
     }
+    /**
+     * Drops the user representing the database. When dropping the user we are connected as, we stay
+     * connected as the management user, as the dropped one can no longer authenticate.
+     */
     async dropDatabase(name) {
         name ??= this.config.get('dbName');
+        const originalUser = this.getOriginalUser();
         this.config.set('user', this.helper.getManagementDbName());
-        await this.driver.reconnect();
+        await this.driver.reconnect({ skipOnConnect: true });
         await this.execute(this.helper.getDropDatabaseSQL(name));
-        this.config.set('user', name);
+        // the dropped user is gone, so a cached `ensureDatabase` result for it is stale
+        this.lastEnsuredDatabase = undefined;
+        if (originalUser !== name) {
+            this.config.set('user', originalUser);
+            await this.driver.reconnect({ skipOnConnect: true });
+        }
     }
     /**
      * Oracle uses CASCADE CONSTRAINT in DROP TABLE and has no native enums,
@@ -78,14 +88,14 @@ export class OracleSchemaGenerator extends SchemaGenerator {
         catch (e) {
             if (e.code === 'ORA-01017' && this.config.get('user') !== this.helper.getManagementDbName()) {
                 this.config.set('user', this.helper.getManagementDbName());
-                await this.driver.reconnect();
+                await this.driver.reconnect({ skipOnConnect: true });
                 const result = await this.ensureDatabase();
                 // Restore connection to the original user (createDatabase does this
                 // when the user doesn't exist, but we must handle the case where
                 // the user already exists and ensureDatabase returned early)
                 if (this.config.get('user') !== dbName) {
                     this.config.set('user', dbName);
-                    await this.driver.reconnect();
+                    await this.driver.reconnect({ skipOnConnect: true });
                 }
                 return result;
             }
@@ -94,8 +104,8 @@ export class OracleSchemaGenerator extends SchemaGenerator {
         this.lastEnsuredDatabase = dbName;
         if (!exists) {
             this.config.set('user', this.helper.getManagementDbName());
-            await this.driver.reconnect();
-            await this.createDatabase(dbName);
+            await this.driver.reconnect({ skipOnConnect: true });
+            await this.createDatabase(dbName, { skipOnConnect: true });
             if (options?.create) {
                 await this.create(options);
             }
@@ -125,7 +135,7 @@ export class OracleSchemaGenerator extends SchemaGenerator {
         }
         const originalUser = this.getOriginalUser();
         this.config.set('user', this.helper.getManagementDbName());
-        await this.driver.reconnect();
+        await this.driver.reconnect({ skipOnConnect: true });
         return originalUser;
     }
     /**
@@ -136,7 +146,7 @@ export class OracleSchemaGenerator extends SchemaGenerator {
             return;
         }
         this.config.set('user', originalUser);
-        await this.driver.reconnect();
+        await this.driver.reconnect({ skipOnConnect: true });
     }
     /**
      * Grants DBA (or fallback individual privileges) to the main user.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/oracledb",
-  "version": "7.1.9-dev.1",
+  "version": "7.1.9-dev.2",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, MariaDB, PostgreSQL, SQLite, MSSQL and Oracle databases.",
   "keywords": [
     "data-mapper",
@@ -42,7 +42,7 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "@mikro-orm/sql": "7.1.9-dev.1",
+    "@mikro-orm/sql": "7.1.9-dev.2",
     "kysely": "0.29.4",
     "oracledb": "7.0.1"
   },
@@ -50,7 +50,7 @@
     "@mikro-orm/core": "^7.1.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.9-dev.1"
+    "@mikro-orm/core": "7.1.9-dev.2"
   },
   "engines": {
     "node": ">= 22.17.0"