@mikro-orm/knex 6.4.14-dev.9 → 6.4.15-dev.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.4.14-dev.9",
+  "version": "6.4.15-dev.0",
   "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",
@@ -63,10 +63,10 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.13"
+    "@mikro-orm/core": "^6.4.14"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.14-dev.9",
+    "@mikro-orm/core": "6.4.15-dev.0",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/QueryBuilder.js

@@ -689,10 +689,7 @@ class QueryBuilder {
         }
         const query = this.toQuery()._sql;
         const cached = await this.em?.tryCache(this.mainAlias.entityName, this._cache, ['qb.execute', query.sql, query.bindings, method]);
-        if (cached?.data === null && method === 'get' && this.type === enums_1.QueryType.SELECT) {
-            return null;
-        }
-        if (cached?.data) {
+        if (cached?.data !== undefined) {
             return cached.data;
         }
         const write = method === 'run' || !this.platform.getConfig().get('preferReadReplicas');

package/query/QueryBuilderHelper.js

@@ -282,12 +282,13 @@ class QueryBuilderHelper {
         const [fromAlias, fromField] = this.splitField(key);
         const prop = this.getProperty(fromField, fromAlias);
         operator = operator === '$not' ? '$eq' : operator;
+        const column = this.mapper(key, undefined, undefined, null);
         if (value === null) {
-            return `${this.knex.ref(this.mapper(key))} is ${operator === '$ne' ? 'not ' : ''}null`;
+            return `${this.knex.ref(column)} is ${operator === '$ne' ? 'not ' : ''}null`;
         }
         if (operator === '$fulltext' && prop) {
             const query = this.knex.raw(this.platform.getFullTextWhereClause(prop), {
-                column: this.mapper(key),
+                column,
                 query: this.knex.raw('?'),
             }).toSQL().toNative();
             params.push(value);
@@ -296,7 +297,7 @@ class QueryBuilderHelper {
         const replacement = this.getOperatorReplacement(operator, { [operator]: value });
         if (['$in', '$nin'].includes(operator) && Array.isArray(value)) {
             params.push(...value);
-            return `${this.knex.ref(this.mapper(key))} ${replacement} (${value.map(() => '?').join(', ')})`;
+            return `${this.knex.ref(column)} ${replacement} (${value.map(() => '?').join(', ')})`;
         }
         if (operator === '$exists') {
             value = null;
@@ -310,14 +311,13 @@ class QueryBuilderHelper {
             }
             return sql;
         }
-        const sql = this.mapper(key);
         if (value !== null) {
             if (prop?.customType) {
                 value = prop.customType.convertToDatabaseValue(value, this.platform, { fromQuery: true, key, mode: 'query' });
             }
             params.push(value);
         }
-        return `${this.knex.ref(sql)} ${replacement} ${value === null ? 'null' : '?'}`;
+        return `${this.knex.ref(column)} ${replacement} ${value === null ? 'null' : '?'}`;
     }
     wrapQueryGroup(parts, operator = '$and') {
         if (parts.length === 1) {

package/schema/DatabaseTable.js

@@ -104,7 +104,7 @@ class DatabaseTable {
             this.columns[field].default = defaultValue;
         });
         if ([core_1.ReferenceKind.MANY_TO_ONE, core_1.ReferenceKind.ONE_TO_ONE].includes(prop.kind)) {
-            const constraintName = this.getIndexName(true, prop.fieldNames, 'foreign');
+            const constraintName = this.getIndexName(prop.foreignKeyName ?? true, prop.fieldNames, 'foreign');
             let schema = prop.targetMeta.root.schema === '*' ? this.schema : (prop.targetMeta.root.schema ?? config.get('schema', this.platform.getDefaultSchemaName()));
             if (prop.referencedTableName.includes('.')) {
                 schema = undefined;