@mikro-orm/knex 6.4.7-dev.9 → 6.4.8-dev.0

package/AbstractSqlDriver.js

@@ -254,6 +254,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 : meta2.props.filter(prop => this.platform.shouldHaveColumn(prop, hint.children || []));
             const tz = this.platform.getTimezone();
             for (const prop of targetProps) {
+                if (prop.fieldNames.every(name => typeof root[`${relationAlias}__${name}`] === 'undefined')) {
+                    continue;
+                }
                 if (prop.fieldNames.length > 1) { // composite keys
                     const fk = prop.fieldNames.map(name => root[`${relationAlias}__${name}`]);
                     const pk = core_1.Utils.mapFlatCompositePrimaryKey(fk, prop);
@@ -930,11 +933,11 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
     getFieldsForJoinedLoad(qb, meta, explicitFields, exclude, populate = [], options, parentTableAlias, parentJoinPath, count) {
         const fields = [];
         const joinedProps = this.joinedProps(meta, populate, options);
-        const shouldHaveColumn = (prop, populate, fields) => {
+        const shouldHaveColumn = (meta, prop, populate, fields) => {
             if (!this.platform.shouldHaveColumn(prop, populate, exclude)) {
                 return false;
             }
-            if (!fields || fields.includes('*') || prop.primary) {
+            if (!fields || fields.includes('*') || prop.primary || meta.root.discriminatorColumn === prop.name) {
                 return true;
             }
             return fields.some(f => f === prop.name || f.toString().startsWith(prop.name + '.'));
@@ -944,7 +947,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         if (parentJoinPath) {
             // alias all fields in the primary table
             meta.props
-                .filter(prop => shouldHaveColumn(prop, populate, explicitFields))
+                .filter(prop => shouldHaveColumn(meta, prop, populate, explicitFields))
                 .forEach(prop => fields.push(...this.mapPropToFieldNames(qb, prop, parentTableAlias)));
         }
         for (const hint of joinedProps) {
@@ -1281,6 +1284,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             if (!options.fields.includes('*') && !options.fields.includes(`${qb.alias}.*`)) {
                 ret.unshift(...meta.primaryKeys.filter(pk => !options.fields.includes(pk)));
             }
+            if (meta.root.discriminatorColumn && !options.fields.includes(`${qb.alias}.${meta.root.discriminatorColumn}`)) {
+                ret.push(meta.root.discriminatorColumn);
+            }
         }
         else if (!core_1.Utils.isEmpty(options.exclude) || lazyProps.some(p => !p.formula && (p.kind !== '1:1' || p.owner))) {
             const props = meta.props.filter(prop => this.platform.shouldHaveColumn(prop, populate, options.exclude, false));

package/dialects/mssql/MsSqlQueryCompiler.js

@@ -59,12 +59,15 @@ class MsSqlQueryCompiler extends MonkeyPatchable_1.MonkeyPatchable.MsSqlQueryCom
             || (typeof insert === 'object' && core_1.Utils.isEmpty(insert));
     }
     _mergeOn(conflict) {
-        let sql = 'on 1=1';
-        if (Array.isArray(conflict)) {
-            const conflictColumn = this.formatter.columnize(conflict[0]);
-            sql = `on ${this.tableName}.${conflictColumn} = tsource.${conflictColumn}`;
+        if (!Array.isArray(conflict)) {
+            return 'on 1=1';
         }
-        return sql;
+        const parts = [];
+        for (const col of conflict) {
+            const conflictColumn = this.formatter.columnize(col);
+            parts.push(`${this.tableName}.${conflictColumn} = tsource.${conflictColumn}`);
+        }
+        return `on ${parts.join(' and ')}`;
     }
     _insertWithMerge() {
         const { insert = [], onConflict, ignore, merge, returning, options = {} } = this.single;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.4.7-dev.9",
+  "version": "6.4.8-dev.0",
   "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",
@@ -63,10 +63,10 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.6"
+    "@mikro-orm/core": "^6.4.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.7-dev.9",
+    "@mikro-orm/core": "6.4.8-dev.0",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/CriteriaNode.js

@@ -72,16 +72,12 @@ class CriteriaNode {
         let joinAlias = qb.getAliasForJoinPath(this.getPath());
         if (!joinAlias && this.parent && [core_1.ReferenceKind.MANY_TO_ONE, core_1.ReferenceKind.ONE_TO_ONE].includes(this.prop.kind) && this.prop.owner) {
             joinAlias = qb.getAliasForJoinPath(this.parent.getPath());
-            return core_1.Utils.getPrimaryKeyHash(this.prop.joinColumns.map(col => `${joinAlias ?? qb.alias}.${col}`));
+            return core_1.Utils.getPrimaryKeyHash(this.prop.ownColumns.map(col => `${joinAlias ?? qb.alias}.${col}`));
         }
         const alias = joinAlias ?? qb.alias;
         if (this.prop.kind === core_1.ReferenceKind.MANY_TO_MANY) {
             return core_1.Utils.getPrimaryKeyHash(this.prop.inverseJoinColumns.map(col => `${alias}.${col}`));
         }
-        // if we found a matching join, we need to use the target table column names, as we use that alias instead of the root
-        if (!joinAlias && this.prop.owner && this.prop.joinColumns.length > 1) {
-            return core_1.Utils.getPrimaryKeyHash(this.prop.joinColumns.map(col => `${alias}.${col}`));
-        }
         return core_1.Utils.getPrimaryKeyHash(this.prop.referencedColumnNames.map(col => `${alias}.${col}`));
     }
     getPath(addIndex = false) {

package/query/QueryBuilderHelper.js

@@ -43,9 +43,6 @@ class QueryBuilderHelper {
                 const prop = this.getProperty(f, a);
                 const fkIdx2 = prop?.fieldNames.findIndex(name => name === f) ?? -1;
                 if (fkIdx2 !== -1) {
-                    if (prop?.ownColumns && !prop.ownColumns.includes(f)) {
-                        continue;
-                    }
                     parts.push(this.mapper(a !== this.alias ? `${a}.${prop.fieldNames[fkIdx2]}` : prop.fieldNames[fkIdx2], type, value, alias));
                 }
                 else if (prop) {
@@ -66,9 +63,6 @@ class QueryBuilderHelper {
                     }
                 });
             }
-            if (parts.length === 1) {
-                return parts[0];
-            }
             return this.knex.raw('(' + parts.map(part => this.knex.ref(part)).join(', ') + ')');
         }
         const rawField = core_1.RawQueryFragment.getKnownFragment(field);