@mikro-orm/knex 6.5.2-dev.3 → 6.5.2-dev.5

package/AbstractSqlDriver.js

@@ -240,7 +240,6 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             let relationPojo = {};
             meta2.props
                 .filter(prop => !ref && prop.persist === false && prop.fieldNames)
-                .filter(prop => !prop.lazy || populate.some(p => p.field === prop.name || p.all))
                 .forEach(prop => {
                 /* istanbul ignore if */
                 if (prop.fieldNames.length > 1) { // composite keys

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.5.2-dev.3",
+  "version": "6.5.2-dev.5",
   "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.5.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.5.2-dev.3",
+    "@mikro-orm/core": "6.5.2-dev.5",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/CriteriaNode.d.ts

@@ -20,7 +20,7 @@ export declare class CriteriaNode<T extends object> implements ICriteriaNode<T>
     shouldInline(payload: any): boolean;
     willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): boolean;
     shouldRename(payload: any): boolean;
-    renameFieldToPK<T>(qb: IQueryBuilder<T>): string;
+    renameFieldToPK<T>(qb: IQueryBuilder<T>, ownerAlias?: string): string;
     getPath(addIndex?: boolean): string;
     private isPivotJoin;
     getPivotPath(path: string): string;

package/query/CriteriaNode.js

@@ -68,13 +68,13 @@ class CriteriaNode {
             default: return false;
         }
     }
-    renameFieldToPK(qb) {
-        let joinAlias = qb.getAliasForJoinPath(this.getPath(), { matchPopulateJoins: true });
+    renameFieldToPK(qb, ownerAlias) {
+        const joinAlias = qb.getAliasForJoinPath(this.getPath(), { matchPopulateJoins: true });
         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}`));
+            const alias = qb.getAliasForJoinPath(this.parent.getPath()) ?? ownerAlias ?? qb.alias;
+            return core_1.Utils.getPrimaryKeyHash(this.prop.joinColumns.map(col => `${alias}.${col}`));
         }
-        const alias = joinAlias ?? qb.alias;
+        const alias = joinAlias ?? ownerAlias ?? qb.alias;
         if (this.prop.kind === core_1.ReferenceKind.MANY_TO_MANY) {
             return core_1.Utils.getPrimaryKeyHash(this.prop.inverseJoinColumns.map(col => `${alias}.${col}`));
         }

package/query/ObjectCriteriaNode.js

@@ -76,7 +76,7 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
                 this.inlineChildPayload(o, payload, field, a, childAlias);
             }
             else if (childNode.shouldRename(payload)) {
-                this.inlineCondition(childNode.renameFieldToPK(qb), o, payload);
+                this.inlineCondition(childNode.renameFieldToPK(qb, alias), o, payload);
             }
             else if (isRawField) {
                 const rawField = core_1.RawQueryFragment.getKnownFragment(field);

package/query/QueryBuilderHelper.js

@@ -315,6 +315,10 @@ class QueryBuilderHelper {
             if (prop?.customType) {
                 value = prop.customType.convertToDatabaseValue(value, this.platform, { fromQuery: true, key, mode: 'query' });
             }
+            if (Array.isArray(value) && key.includes(core_1.Utils.PK_SEPARATOR)) {
+                const val = `(${value.map(() => '?').join(', ')})`;
+                value = this.knex.raw(val, value);
+            }
             params.push(value);
         }
         return `${this.knex.ref(column)} ${replacement} ${value === null ? 'null' : '?'}`;

package/typings.d.ts

@@ -186,7 +186,7 @@ export interface ICriteriaNode<T extends object> {
     shouldInline(payload: any): boolean;
     willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): boolean;
     shouldRename(payload: any): boolean;
-    renameFieldToPK<T>(qb: IQueryBuilder<T>): string;
+    renameFieldToPK<T>(qb: IQueryBuilder<T>, ownerAlias?: string): string;
     getPath(addIndex?: boolean): string;
     getPivotPath(path: string): string;
 }