@mikro-orm/oracledb 7.1.9-dev.9 → 7.1.9

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/oracledb",
-  "version": "7.1.9-dev.9",
+  "version": "7.1.9",
   "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.1.9-dev.9",
+    "@mikro-orm/sql": "7.1.9",
     "kysely": "0.29.4",
     "oracledb": "7.0.1"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.1.8"
+    "@mikro-orm/core": "^7.1.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.9-dev.9"
+    "@mikro-orm/core": "7.1.9"
   },
   "engines": {
     "node": ">= 22.17.0"