@mikro-orm/knex 6.0.0-dev.12 → 6.0.0-dev.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.12",
+  "version": "6.0.0-dev.14",
   "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,9 +63,9 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^5.5.3"
+    "@mikro-orm/core": "^5.6.0"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.12"
+    "@mikro-orm/core": "~6.0.0-dev.14"
   }
 }

package/query/QueryBuilder.js

@@ -669,7 +669,8 @@ class QueryBuilder {
         }
         if (data) {
             if (core_1.Utils.isEntity(data)) {
-                data = (0, core_1.helper)(data).toJSON();
+                // data = helper(data).toJSON();
+                data = this.em?.getComparator().prepareEntity(data) ?? (0, core_1.serialize)(data);
             }
             this._data = this.helper.processData(data, this.flags.has(core_1.QueryFlag.CONVERT_CUSTOM_TYPES));
         }

package/query/QueryBuilderHelper.js

@@ -429,13 +429,13 @@ class QueryBuilderHelper {
                 ret.push(`${k} ${order.toLowerCase()}`);
                 return;
             }
-            // eslint-disable-next-line prefer-const
-            let [alias, field] = this.splitField(k, true);
-            alias = populate[alias] || alias;
-            core_1.Utils.splitPrimaryKeys(field).forEach(f => {
-                const prop = this.getProperty(f, alias);
+            core_1.Utils.splitPrimaryKeys(k).forEach(f => {
+                // eslint-disable-next-line prefer-const
+                let [alias, field] = this.splitField(f, true);
+                alias = populate[alias] || alias;
+                const prop = this.getProperty(field, alias);
                 const noPrefix = (prop && prop.persist === false && !prop.formula) || QueryBuilderHelper.isCustomExpression(f);
-                const column = this.mapper(noPrefix ? f : `${alias}.${f}`, type, undefined, null);
+                const column = this.mapper(noPrefix ? field : `${alias}.${field}`, type, undefined, null);
                 /* istanbul ignore next */
                 const rawColumn = core_1.Utils.isString(column) ? column.split('.').map(e => this.knex.ref(e)).join('.') : column;
                 const customOrder = prop?.customOrder;

package/schema/SchemaComparator.js

@@ -425,8 +425,10 @@ class SchemaComparator {
         return index1.primary === index2.primary && index1.unique === index2.unique;
     }
     diffCheck(check1, check2) {
-        const unquote = (str) => str?.replace(/['"`]/g, '');
-        return unquote(check1.expression) !== unquote(check2.expression);
+        // check constraint definition might be normalized by the driver,
+        // e.g. quotes might be added (https://github.com/mikro-orm/mikro-orm/issues/3827)
+        const simplify = (str) => str?.replace(/['"`()]/g, '').toLowerCase();
+        return simplify(check1.expression) !== simplify(check2.expression);
     }
     hasSameDefaultValue(from, to) {
         if (from.default == null || from.default.toString().toLowerCase() === 'null' || from.default.toString().startsWith('nextval(')) {