@mikro-orm/knex 6.2.6-dev.9 → 6.2.7-dev.0

package/AbstractSqlDriver.js

@@ -248,7 +248,8 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 }
                 else if (prop.runtimeType === 'Date') {
                     const alias = `${relationAlias}__${prop.fieldNames[0]}`;
-                    relationPojo[prop.name] = (typeof root[alias] === 'string' ? new Date(root[alias]) : root[alias]);
+                    const type = typeof root[alias];
+                    relationPojo[prop.name] = (['string', 'number'].includes(type) ? this.platform.parseDate(root[alias]) : root[alias]);
                 }
                 else {
                     const alias = `${relationAlias}__${prop.fieldNames[0]}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.2.6-dev.9",
+  "version": "6.2.7-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,9 +63,9 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.2.5"
+    "@mikro-orm/core": "^6.2.6"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.2.6-dev.9"
+    "@mikro-orm/core": "6.2.7-dev.0"
   }
 }

package/query/QueryBuilder.js

@@ -1278,7 +1278,19 @@ class QueryBuilder {
             }
         }
         addPath(this._populate);
-        for (const [key, join] of Object.entries(this._joins)) {
+        const joins = Object.entries(this._joins);
+        const rootAlias = this.alias;
+        function addParentAlias(alias) {
+            const join = joins.find(j => j[1].alias === alias);
+            if (join && join[1].ownerAlias !== rootAlias) {
+                orderByAliases.push(join[1].ownerAlias);
+                addParentAlias(join[1].ownerAlias);
+            }
+        }
+        for (const orderByAlias of orderByAliases) {
+            addParentAlias(orderByAlias);
+        }
+        for (const [key, join] of joins) {
             const path = join.path?.replace(/\[populate]|\[pivot]|:ref/g, '').replace(new RegExp(`^${meta.className}.`), '');
             if (!populate.has(path ?? '') && !orderByAliases.includes(join.alias)) {
                 delete this._joins[key];

package/query/QueryBuilderHelper.js

@@ -542,7 +542,8 @@ class QueryBuilderHelper {
             if (returningProps.length > 0) {
                 qb.returning(returningProps.flatMap(prop => {
                     if (prop.hasConvertToJSValueSQL) {
-                        const sql = prop.customType.convertToJSValueSQL(prop.fieldNames[0], this.platform) + ' as ' + this.platform.quoteIdentifier(prop.fieldNames[0]);
+                        const aliased = this.platform.quoteIdentifier(prop.fieldNames[0]);
+                        const sql = prop.customType.convertToJSValueSQL(aliased, this.platform) + ' as ' + this.platform.quoteIdentifier(prop.fieldNames[0]);
                         return [this.knex.raw(sql)];
                     }
                     return prop.fieldNames;