@mikro-orm/knex 6.6.5-dev.2 → 6.6.5-dev.4

package/AbstractSqlDriver.js

@@ -368,7 +368,8 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         const set = new Set();
         data.forEach(row => core_1.Utils.keys(row).forEach(k => set.add(k)));
         const props = [...set].map(name => meta?.properties[name] ?? { name, fieldNames: [name] });
-        let fields = core_1.Utils.flatten(props.map(prop => prop.fieldNames));
+        // For STI with conflicting fieldNames, include all alternative columns
+        let fields = core_1.Utils.flatten(props.map(prop => prop.stiFieldNames ?? prop.fieldNames));
         const duplicates = core_1.Utils.findDuplicates(fields);
         const params = [];
         if (duplicates.length) {
@@ -425,6 +426,15 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 const keys = [];
                 const usedDups = [];
                 props.forEach(prop => {
+                    // For STI with conflicting fieldNames, use discriminator to determine which field gets value
+                    if (prop.stiFieldNames && prop.stiFieldNameMap && meta?.discriminatorColumn) {
+                        const activeField = prop.stiFieldNameMap[row[meta.discriminatorColumn]];
+                        for (const field of prop.stiFieldNames) {
+                            params.push(field === activeField ? row[prop.name] : null);
+                            keys.push('?');
+                        }
+                        return;
+                    }
                     if (prop.fieldNames.length > 1) {
                         const newFields = [];
                         const allParam = [...core_1.Utils.asArray(row[prop.name]) ?? prop.fieldNames.map(() => null)];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.6.5-dev.2",
+  "version": "6.6.5-dev.4",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -66,7 +66,7 @@
     "@mikro-orm/core": "^6.6.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.6.5-dev.2",
+    "@mikro-orm/core": "6.6.5-dev.4",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"