@mikro-orm/oracledb 7.2.2-dev.6 → 7.2.2-dev.7

package/OracleDriver.d.ts

@@ -1,4 +1,4 @@
-import { type AnyEntity, type Configuration, type ConnectionType, type Constructor, type EntityDictionary, type EntityName, type FilterQuery, type LoggingOptions, type NativeInsertUpdateManyOptions, type QueryResult, type Transaction, type UpsertManyOptions } from '@mikro-orm/core';
+import { type AnyEntity, type Configuration, type ConnectionType, type Constructor, type EntityDictionary, type EntityName, type EntityProperty, type FilterQuery, type LoggingOptions, type NativeInsertUpdateManyOptions, type QueryResult, type Transaction, type UpsertManyOptions } from '@mikro-orm/core';
 import { AbstractSqlDriver, type SqlEntityManager } from '@mikro-orm/sql';
 import { OracleConnection } from './OracleConnection.js';
 import { OracleMikroORM } from './OracleMikroORM.js';
@@ -9,6 +9,7 @@ export declare class OracleDriver extends AbstractSqlDriver<OracleConnection, Or
     constructor(config: Configuration);
     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>>;
+    protected getReturningFieldSQL(prop: EntityProperty, fieldName: string, index: number): string;
     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`.

package/OracleDriver.js

@@ -1,4 +1,4 @@
-import { isRaw, QueryFlag, ReferenceKind, Utils, } from '@mikro-orm/core';
+import { QueryFlag, ReferenceKind, Utils, } from '@mikro-orm/core';
 import { AbstractSqlDriver } from '@mikro-orm/sql';
 import { OracleConnection } from './OracleConnection.js';
 import { OracleMikroORM } from './OracleMikroORM.js';
@@ -45,22 +45,20 @@ export class OracleDriver extends AbstractSqlDriver {
         }
         return res;
     }
+    getReturningFieldSQL(prop, fieldName, index) {
+        // the value lands in a named OUT bind, and `returning ... into` does not allow column aliases
+        const quoted = this.platform.quoteIdentifier(fieldName);
+        const customType = prop.customTypes?.[index] ?? prop.customType;
+        if (prop.hasConvertToJSValueSQL && customType?.convertToJSValueSQL) {
+            return customType.convertToJSValueSQL(quoted, this.platform);
+        }
+        return quoted;
+    }
     async nativeUpdateMany(entityName, where, data, options = {}) {
         const meta = this.metadata.get(entityName);
-        const returning = new Set();
         const into = [];
         const outBindingsMap = {};
-        for (const row of data) {
-            for (const k of Utils.keys(row)) {
-                if (isRaw(row[k])) {
-                    returning.add(k);
-                }
-            }
-        }
-        // reload generated columns and version fields
-        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];
+        for (const prop of this.getUpdateReturningProperties(meta, data)) {
             // 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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/oracledb",
-  "version": "7.2.2-dev.6",
+  "version": "7.2.2-dev.7",
   "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.2.2-dev.6",
+    "@mikro-orm/sql": "7.2.2-dev.7",
     "kysely": "0.29.6",
     "oracledb": "7.0.1"
   },
@@ -50,7 +50,7 @@
     "@mikro-orm/core": "^7.2.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.2-dev.6"
+    "@mikro-orm/core": "7.2.2-dev.7"
   },
   "engines": {
     "node": ">= 22.17.0"