@mikro-orm/knex 6.4.4-dev.8 → 6.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.4.4-dev.8",
+  "version": "6.4.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",
@@ -63,10 +63,10 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.3"
+    "@mikro-orm/core": "^6.4.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.4-dev.8",
+    "@mikro-orm/core": "^6.0.0",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/QueryBuilderHelper.js

@@ -187,6 +187,7 @@ class QueryBuilderHelper {
                 return;
             }
             const { sql, params } = this.createJoinExpression(join, joins, schema);
+            // console.log(sql, params);
             qb.joinRaw(sql, params);
         });
     }
@@ -275,14 +276,14 @@ class QueryBuilderHelper {
             const parts = Object.keys(value).map(op => this.processJoinClause(key, value[op], alias, params, op));
             return this.wrapQueryGroup(parts);
         }
+        const [fromAlias, fromField] = this.splitField(key);
+        const prop = this.getProperty(fromField, fromAlias);
         operator = operator === '$not' ? '$eq' : operator;
         if (value === null) {
             return `${this.knex.ref(this.mapper(key))} is ${operator === '$ne' ? 'not ' : ''}null`;
         }
-        if (operator === '$fulltext') {
-            const [fromAlias, fromField] = this.splitField(key);
-            const property = this.getProperty(fromField, fromAlias);
-            const query = this.knex.raw(this.platform.getFullTextWhereClause(property), {
+        if (operator === '$fulltext' && prop) {
+            const query = this.knex.raw(this.platform.getFullTextWhereClause(prop), {
                 column: this.mapper(key),
                 query: this.knex.raw('?'),
             }).toSQL().toNative();
@@ -309,6 +310,9 @@ class QueryBuilderHelper {
         }
         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' : '?'}`;