@mikro-orm/knex 6.1.10-dev.11 → 6.1.10-dev.13

package/AbstractSqlDriver.js

@@ -826,7 +826,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     if (!item[propName]) {
                         continue;
                     }
-                    if (prop.kind === core_1.ReferenceKind.MANY_TO_MANY && ref) {
+                    if ([core_1.ReferenceKind.ONE_TO_MANY, core_1.ReferenceKind.MANY_TO_MANY].includes(prop.kind) && ref) {
                         map[pk][propName] = [...map[pk][propName], ...item[propName]];
                         continue;
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.1.10-dev.11",
+  "version": "6.1.10-dev.13",
   "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.1.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.1.10-dev.11"
+    "@mikro-orm/core": "6.1.10-dev.13"
   }
 }

package/query/QueryBuilderHelper.js

@@ -86,7 +86,11 @@ class QueryBuilderHelper {
             const alias2 = this.knex.ref(a).toString();
             const aliased = this.knex.ref(prop.fieldNames[0]).toString();
             const as = alias === null ? '' : ` as ${aliased}`;
-            return this.knex.raw(`${prop.formula(alias2)}${as}`);
+            let value = prop.formula(alias2);
+            if (!this.isTableNameAliasRequired(type)) {
+                value = value.replaceAll(alias2 + '.', '');
+            }
+            return this.knex.raw(`${value}${as}`);
         }
         if (prop?.hasConvertToJSValueSQL) {
             let valueSQL;