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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.2.7-dev.2",
+  "version": "6.2.7-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,6 +66,6 @@
     "@mikro-orm/core": "^6.2.6"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.2.7-dev.2"
+    "@mikro-orm/core": "6.2.7-dev.4"
   }
 }

package/query/ObjectCriteriaNode.js

@@ -115,20 +115,17 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
         const operator = core_1.Utils.isObject(payload) && Object.keys(payload).every(k => core_1.Utils.isOperator(k, false));
         return !!this.prop && this.prop.kind !== core_1.ReferenceKind.SCALAR && !scalar && !operator;
     }
-    getChildKey(k, prop, childAlias) {
+    getChildKey(k, prop, childAlias, alias) {
         const idx = prop.referencedPKs.indexOf(k);
-        return idx !== -1 && !childAlias && ![core_1.ReferenceKind.ONE_TO_MANY, core_1.ReferenceKind.MANY_TO_MANY].includes(prop.kind) ? prop.joinColumns[idx] : k;
+        return idx !== -1 && !childAlias && ![core_1.ReferenceKind.ONE_TO_MANY, core_1.ReferenceKind.MANY_TO_MANY].includes(prop.kind)
+            ? this.aliased(prop.joinColumns[idx], alias)
+            : k;
     }
-    inlineArrayChildPayload(obj, payload, k, prop, childAlias) {
+    inlineArrayChildPayload(obj, payload, k, prop, childAlias, alias) {
         const key = this.getChildKey(k, prop, childAlias);
         const value = payload.map((child) => Object.keys(child).reduce((inner, childKey) => {
-            if (core_1.Utils.isGroupOperator(childKey) && Array.isArray(child[childKey])) {
-                this.inlineArrayChildPayload(child, child[childKey], childKey, prop, childAlias);
-            }
-            else {
-                const key = (this.isPrefixed(childKey) || core_1.Utils.isOperator(childKey)) ? childKey : this.aliased(childKey, childAlias);
-                inner[key] = child[childKey];
-            }
+            const key = (this.isPrefixed(childKey) || core_1.Utils.isOperator(childKey)) ? childKey : this.aliased(childKey, childAlias);
+            inner[key] = child[childKey];
             return inner;
         }, {}));
         this.inlineCondition(key, obj, value);
@@ -142,10 +139,10 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
                 o[this.aliased(field, alias)] = { [k]: tmp, ...o[this.aliased(field, alias)] };
             }
             else if (core_1.Utils.isGroupOperator(k) && Array.isArray(payload[k])) {
-                this.inlineArrayChildPayload(o, payload[k], k, prop, childAlias);
+                this.inlineArrayChildPayload(o, payload[k], k, prop, childAlias, alias);
             }
             else if (this.isPrefixed(k) || core_1.Utils.isOperator(k) || !childAlias) {
-                const key = this.getChildKey(k, prop, childAlias);
+                const key = this.getChildKey(k, prop, childAlias, alias);
                 this.inlineCondition(key, o, payload[k]);
             }
             else if (core_1.RawQueryFragment.isKnownFragment(k)) {
@@ -162,6 +159,7 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
             o[key] = value;
             return;
         }
+        /* istanbul ignore next */
         if (key === '$and') {
             o.$and.push({ [key]: value });
             return;

package/schema/SqlSchemaGenerator.js

@@ -441,6 +441,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         this.config.set('dbName', this.helper.getManagementDbName());
         await this.driver.reconnect();
         await this.execute(this.helper.getDropDatabaseSQL(name));
+        this.config.set('dbName', name);
     }
     async execute(sql, options = {}) {
         options.wrap ??= false;