@mikro-orm/oracledb 7.2.0-dev.3 → 7.2.0-dev.4

package/OracleConnection.js

@@ -31,10 +31,29 @@ export class OracleConnection extends AbstractSqlConnection {
         const password = options.password;
         const onCreateConnection = this.options.onCreateConnection ?? this.config.get('onCreateConnection');
         const initialPassword = typeof password === 'function' ? await password() : password;
+        const dbName = this.config.get('dbName');
+        // unqualified names resolve against the login user's schema, but we manage `dbName`
+        const setSchemaSql = this.config.get('user', dbName) === dbName ? undefined : this.platform.getSchemaHelper().getSetSchemaSQL(dbName);
         const poolOptions = {
             ...options,
             password: initialPassword,
-            sessionCallback: onCreateConnection,
+            sessionCallback: setSchemaSql || onCreateConnection
+                ? (conn, _requestedTag, cb) => {
+                    const initSession = async () => {
+                        if (setSchemaSql) {
+                            // ORA-01435: the schema might not exist yet, `ensureDatabase()` creates it later on
+                            await conn.execute(setSchemaSql).catch((e) => {
+                                /* v8 ignore next 3: other failures of `alter session` are not reproducible in tests */
+                                if (e.errorNum !== 1435) {
+                                    throw e;
+                                }
+                            });
+                        }
+                        await onCreateConnection?.(conn);
+                    };
+                    initSession().then(() => cb(), cb);
+                }
+                : undefined,
         };
         // Retry pool creation for transient Oracle errors (e.g. ORA-01017 under load)
         let pool;

package/OracleDriver.d.ts

@@ -10,6 +10,12 @@ export declare class OracleDriver extends AbstractSqlDriver<OracleConnection, Or
     createQueryBuilder<T extends AnyEntity<T>>(entityName: EntityName<T>, ctx?: Transaction, preferredConnectionType?: ConnectionType, convertCustomTypes?: boolean, loggerContext?: LoggingOptions, alias?: string, em?: SqlEntityManager): OracleQueryBuilder<T, any, any, any>;
     nativeInsertMany<T extends object>(entityName: EntityName<T>, data: EntityDictionary<T>[], options?: NativeInsertUpdateManyOptions<T>): Promise<QueryResult<T>>;
     nativeUpdateMany<T extends object>(entityName: EntityName<T>, where: FilterQuery<T>[], data: EntityDictionary<T>[], options?: NativeInsertUpdateManyOptions<T> & UpsertManyOptions<T>): Promise<QueryResult<T>>;
+    /**
+     * Resolves the runtime type of every column a property maps to, aligned with its `fieldNames`.
+     * A relation covers one column per target PK column, and a target PK can be a relation itself,
+     * so we recurse down to the scalar leaves - `prop.runtimeType` is `unknown` for relations.
+     */
+    private getOutBindTypes;
     /** @inheritDoc */
     getORMClass(): Constructor<OracleMikroORM>;
 }

package/OracleDriver.js

@@ -1,4 +1,4 @@
-import { isRaw, QueryFlag, Utils, } from '@mikro-orm/core';
+import { isRaw, QueryFlag, ReferenceKind, Utils, } from '@mikro-orm/core';
 import { AbstractSqlDriver } from '@mikro-orm/sql';
 import { OracleConnection } from './OracleConnection.js';
 import { OracleMikroORM } from './OracleMikroORM.js';
@@ -32,7 +32,7 @@ export class OracleDriver extends AbstractSqlDriver {
         let pk;
         if (pks.length > 1) {
             // owner has composite pk
-            pk = data.map(d => Utils.getPrimaryKeyCond(d, pks));
+            pk = data.map(d => Utils.getOrderedPrimaryKeys(d, meta));
         }
         else {
             res.row ??= {};
@@ -61,8 +61,12 @@ export class OracleDriver extends AbstractSqlDriver {
         meta.props.filter(prop => prop.generated || prop.version || prop.primary).forEach(prop => returning.add(prop.name));
         for (const propName of returning) {
             const prop = meta.properties[propName];
-            into.push(`:out_${prop.fieldNames[0]}`);
-            outBindingsMap[`out_${prop.fieldNames[0]}`] = prop.runtimeType;
+            // the parent builds the `returning` list from all field names, so every column needs its own OUT bind
+            const runtimeTypes = this.getOutBindTypes(prop);
+            prop.fieldNames.forEach((fieldName, idx) => {
+                into.push(`:out_${fieldName}`);
+                outBindingsMap[`out_${fieldName}`] = runtimeTypes[idx];
+            });
         }
         const outBindings = this.platform.createOutBindings(outBindingsMap);
         return super.nativeUpdateMany(entityName, where, data, options, (sql, params) => {
@@ -74,6 +78,19 @@ export class OracleDriver extends AbstractSqlDriver {
             return `${sql} into ${into.join(', ')}`;
         });
     }
+    /**
+     * Resolves the runtime type of every column a property maps to, aligned with its `fieldNames`.
+     * A relation covers one column per target PK column, and a target PK can be a relation itself,
+     * so we recurse down to the scalar leaves - `prop.runtimeType` is `unknown` for relations.
+     */
+    getOutBindTypes(prop) {
+        if (!prop.targetMeta || ![ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind)) {
+            return prop.fieldNames.map(() => prop.runtimeType);
+        }
+        const types = prop.referencedPKs.flatMap(pk => this.getOutBindTypes(prop.targetMeta.properties[pk]));
+        // `fieldNames` of a polymorphic relation start with the discriminator column
+        return prop.polymorphic ? ['string', ...types] : types;
+    }
     /** @inheritDoc */
     getORMClass() {
         return OracleMikroORM;

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.2.0-dev.3",
+  "version": "7.2.0-dev.4",
   "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,15 +42,15 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "@mikro-orm/sql": "7.2.0-dev.3",
+    "@mikro-orm/sql": "7.2.0-dev.4",
     "kysely": "0.29.4",
     "oracledb": "7.0.1"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.1.7"
+    "@mikro-orm/core": "^7.1.11"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.0-dev.3"
+    "@mikro-orm/core": "7.2.0-dev.4"
   },
   "engines": {
     "node": ">= 22.17.0"