@mikro-orm/knex 6.4.9-dev.2 → 6.4.9-dev.4

package/AbstractSqlDriver.js

@@ -442,7 +442,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     else {
                         const field = prop.fieldNames[0];
                         if (!duplicates.includes(field) || !usedDups.includes(field)) {
-                            if (prop.customType && !prop.object && 'convertToDatabaseValueSQL' in prop.customType && !this.platform.isRaw(row[prop.name])) {
+                            if (prop.customType && !prop.object && 'convertToDatabaseValueSQL' in prop.customType && row[prop.name] != null && !this.platform.isRaw(row[prop.name])) {
                                 keys.push(prop.customType.convertToDatabaseValueSQL('?', this.platform));
                             }
                             else {
@@ -593,7 +593,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     if (key in data[idx]) {
                         const pks = core_1.Utils.getOrderedPrimaryKeys(cond, meta);
                         sql += ` when (${pkCond}) then `;
-                        if (prop.customType && !prop.object && 'convertToDatabaseValueSQL' in prop.customType && !this.platform.isRaw(data[idx][key])) {
+                        if (prop.customType && !prop.object && 'convertToDatabaseValueSQL' in prop.customType && data[idx][prop.name] != null && !this.platform.isRaw(data[idx][key])) {
                             sql += prop.customType.convertToDatabaseValueSQL('?', this.platform);
                         }
                         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.4.9-dev.2",
+  "version": "6.4.9-dev.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",
@@ -66,7 +66,7 @@
     "@mikro-orm/core": "^6.4.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.9-dev.2",
+    "@mikro-orm/core": "6.4.9-dev.4",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/QueryBuilderHelper.js

@@ -260,6 +260,10 @@ class QueryBuilderHelper {
             });
             return this.wrapQueryGroup(parts, key);
         }
+        const rawField = core_1.RawQueryFragment.getKnownFragment(key);
+        if (!rawField && !core_1.Utils.isOperator(key, false) && !this.isPrefixed(key)) {
+            key = `${alias}.${key}`;
+        }
         if (this.isSimpleRegExp(value)) {
             params.push(this.getRegExpParam(value));
             return `${this.knex.ref(this.mapper(key))} like ?`;
@@ -297,7 +301,6 @@ class QueryBuilderHelper {
         if (operator === '$exists') {
             value = null;
         }
-        const rawField = core_1.RawQueryFragment.getKnownFragment(key);
         if (rawField) {
             let sql = rawField.sql.replaceAll(core_1.ALIAS_REPLACEMENT, alias);
             params.push(...rawField.params);