@mikro-orm/knex 5.8.11-dev.1 → 5.8.11-dev.10

package/package.json

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

package/query/QueryBuilder.js

@@ -473,7 +473,8 @@ class QueryBuilder {
         if (cached?.data) {
             return cached.data;
         }
-        const type = this.connectionType || (method === 'run' ? 'write' : 'read');
+        const write = method === 'run' || !this.platform.getConfig().get('preferReadReplicas');
+        const type = this.connectionType || (write ? 'write' : 'read');
         const res = await this.driver.getConnection(type).execute(query.sql, query.bindings, method, this.context);
         const meta = this.mainAlias.metadata;
         if (!options.mapResults || !meta) {
@@ -689,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);
@@ -705,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);
@@ -729,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 */

package/query/QueryBuilderHelper.js

@@ -29,7 +29,11 @@ class QueryBuilderHelper {
             for (const p of fields) {
                 const [a, f] = this.splitField(p);
                 const prop = this.getProperty(f, a);
-                if (prop) {
+                const fkIdx2 = prop?.fieldNames.findIndex(name => name === f) ?? -1;
+                if (fkIdx2 !== -1) {
+                    parts.push(this.mapper(a !== this.alias ? `${a}.${prop.fieldNames[fkIdx2]}` : prop.fieldNames[fkIdx2], type, value, alias));
+                }
+                else if (prop) {
                     parts.push(...prop.fieldNames.map(f => this.mapper(a !== this.alias ? `${a}.${f}` : f, type, value, alias)));
                 }
                 else {
@@ -53,9 +57,11 @@ class QueryBuilderHelper {
         const customExpression = QueryBuilderHelper.isCustomExpression(field, !!alias);
         const [a, f] = this.splitField(field);
         const prop = this.getProperty(f, a);
+        const fkIdx2 = prop?.fieldNames.findIndex(name => name === f) ?? -1;
+        const fkIdx = fkIdx2 === -1 ? 0 : fkIdx2;
         // embeddable nested path instead of a regular property with table alias, reset alias
         if (prop?.name === a && prop.embeddedProps[f]) {
-            return this.alias + '.' + prop.fieldNames[0];
+            return this.alias + '.' + prop.fieldNames[fkIdx];
         }
         const noPrefix = prop && prop.persist === false;
         if (prop?.fieldNameRaw) {
@@ -68,16 +74,24 @@ class QueryBuilderHelper {
             return this.knex.raw(`${prop.formula(alias2)}${as}`);
         }
         if (prop?.hasConvertToJSValueSQL) {
-            const prefixed = this.prefix(field, isTableNameAliasRequired, true);
-            const valueSQL = prop.customType.convertToJSValueSQL(prefixed, this.platform);
+            let valueSQL;
+            if (prop.fieldNames.length > 1 && fkIdx !== -1) {
+                const fk = prop.targetMeta.getPrimaryProps()[fkIdx];
+                const prefixed = this.prefix(field, isTableNameAliasRequired, true, fkIdx);
+                valueSQL = fk.customType.convertToJSValueSQL(prefixed, this.platform);
+            }
+            else {
+                const prefixed = this.prefix(field, isTableNameAliasRequired, true);
+                valueSQL = prop.customType.convertToJSValueSQL(prefixed, this.platform);
+            }
             if (alias === null) {
                 return this.knex.raw(valueSQL);
             }
-            return this.knex.raw(`${valueSQL} as ${this.platform.quoteIdentifier(alias ?? prop.fieldNames[0])}`);
+            return this.knex.raw(`${valueSQL} as ${this.platform.quoteIdentifier(alias ?? prop.fieldNames[fkIdx])}`);
         }
         // do not wrap custom expressions
         if (!customExpression) {
-            ret = this.prefix(field);
+            ret = this.prefix(field, false, false, fkIdx);
         }
         if (alias) {
             ret += ' as ' + alias;
@@ -529,11 +543,11 @@ class QueryBuilderHelper {
         const re = hasAlias ? /[ ?<>=()'"`:]|^\d/ : /[?<>=()'"`:]|^\d/;
         return !!field.match(re);
     }
-    prefix(field, always = false, quote = false) {
+    prefix(field, always = false, quote = false, idx) {
         let ret;
         if (!this.isPrefixed(field)) {
             const alias = always ? (quote ? this.alias : this.platform.quoteIdentifier(this.alias)) + '.' : '';
-            const fieldName = this.fieldName(field, this.alias, always);
+            const fieldName = this.fieldName(field, this.alias, always, idx);
             if (QueryBuilderHelper.isCustomExpression(fieldName)) {
                 return fieldName;
             }
@@ -542,7 +556,7 @@ class QueryBuilderHelper {
         else {
             const [a, ...rest] = field.split('.');
             const f = rest.join('.');
-            ret = a + '.' + this.fieldName(f, a);
+            ret = a + '.' + this.fieldName(f, a, always, idx);
         }
         if (quote) {
             return this.platform.quoteIdentifier(ret);
@@ -568,7 +582,7 @@ class QueryBuilderHelper {
     isPrefixed(field) {
         return !!field.match(/[\w`"[\]]+\./);
     }
-    fieldName(field, alias, always) {
+    fieldName(field, alias, always, idx = 0) {
         const prop = this.getProperty(field, alias);
         if (!prop) {
             return field;
@@ -586,7 +600,7 @@ class QueryBuilderHelper {
             return prop.fieldNameRaw;
         }
         /* istanbul ignore next */
-        return prop.fieldNames?.[0] ?? field;
+        return prop.fieldNames?.[idx] ?? field;
     }
     getProperty(field, alias) {
         const entityName = this.aliasMap[alias]?.entityName || this.entityName;
@@ -604,7 +618,13 @@ class QueryBuilderHelper {
                 return nest(prop);
             }
         }
-        return meta?.properties[field];
+        if (meta) {
+            if (meta.properties[field]) {
+                return meta.properties[field];
+            }
+            return meta.relations.find(prop => prop.fieldNames?.some(name => field === name));
+        }
+        return undefined;
     }
     isTableNameAliasRequired(type) {
         return [enums_1.QueryType.SELECT, enums_1.QueryType.COUNT].includes(type ?? enums_1.QueryType.SELECT);