@mikro-orm/knex 5.8.11-dev.8 → 5.8.11-dev.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "5.8.11-dev.8",
+  "version": "5.8.11-dev.9",
   "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,9 +66,9 @@
     "@mikro-orm/core": "^5.8.10"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "5.8.11-dev.8",
-    "@mikro-orm/entity-generator": "5.8.11-dev.8",
-    "@mikro-orm/migrations": "5.8.11-dev.8",
+    "@mikro-orm/core": "5.8.11-dev.9",
+    "@mikro-orm/entity-generator": "5.8.11-dev.9",
+    "@mikro-orm/migrations": "5.8.11-dev.9",
     "better-sqlite3": "*",
     "mssql": "*",
     "mysql": "*",

package/query/QueryBuilder.js

@@ -690,6 +690,12 @@ class QueryBuilder {
     }
     prepareFields(fields, type = 'where') {
         const ret = [];
+        const getFieldName = (name) => {
+            if (type === 'groupBy') {
+                return this.helper.mapper(name, this.type, undefined, null);
+            }
+            return this.helper.mapper(name, this.type);
+        };
         fields.forEach(field => {
             if (!core_1.Utils.isString(field)) {
                 return ret.push(field);
@@ -706,19 +712,18 @@ class QueryBuilder {
             }
             if (prop?.embedded) {
                 const name = this._aliases[a] ? `${a}.${prop.fieldNames[0]}` : prop.fieldNames[0];
-                const fieldName = this.helper.mapper(name, this.type);
-                ret.push(fieldName);
+                ret.push(getFieldName(name));
                 return;
             }
             if (prop?.reference === core_1.ReferenceType.EMBEDDED) {
                 if (prop.object) {
-                    ret.push(this.helper.mapper(prop.fieldNames[0], this.type));
+                    ret.push(getFieldName(prop.fieldNames[0]));
                 }
                 else {
                     const nest = (prop) => {
                         for (const childProp of Object.values(prop.embeddedProps)) {
                             if (childProp.fieldNames) {
-                                ret.push(this.helper.mapper(childProp.fieldNames[0], this.type));
+                                ret.push(getFieldName(childProp.fieldNames[0]));
                             }
                             else {
                                 nest(childProp);
@@ -730,10 +735,10 @@ class QueryBuilder {
                 return;
             }
             if (prop && prop.fieldNames.length > 1) {
-                ret.push(...prop.fieldNames.map(f => this.helper.mapper(f, this.type)));
+                ret.push(...prop.fieldNames.map(f => getFieldName(f)));
                 return;
             }
-            ret.push(this.helper.mapper(field, this.type));
+            ret.push(getFieldName(field));
         });
         const meta = this.mainAlias.metadata;
         /* istanbul ignore next */