@mikro-orm/knex 6.2.8-dev.0 → 6.2.8-dev.1

package/AbstractSqlDriver.js

@@ -240,6 +240,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             const targetProps = ref
                 ? meta2.getPrimaryProps()
                 : meta2.props.filter(prop => this.platform.shouldHaveColumn(prop, hint.children || []));
+            const tz = this.platform.getTimezone();
             for (const prop of targetProps) {
                 if (prop.fieldNames.length > 1) { // composite keys
                     const fk = prop.fieldNames.map(name => root[`${relationAlias}__${name}`]);
@@ -248,8 +249,16 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 }
                 else if (prop.runtimeType === 'Date') {
                     const alias = `${relationAlias}__${prop.fieldNames[0]}`;
-                    const type = typeof root[alias];
-                    relationPojo[prop.name] = (['string', 'number'].includes(type) ? this.platform.parseDate(root[alias]) : root[alias]);
+                    const value = root[alias];
+                    if (tz && tz !== 'local' && typeof value === 'string' && !value.includes('+') && !value.endsWith('Z')) {
+                        relationPojo[prop.name] = this.platform.parseDate(value + tz);
+                    }
+                    else if (['string', 'number'].includes(typeof value)) {
+                        relationPojo[prop.name] = this.platform.parseDate(value);
+                    }
+                    else {
+                        relationPojo[prop.name] = value;
+                    }
                 }
                 else {
                     const alias = `${relationAlias}__${prop.fieldNames[0]}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.2.8-dev.0",
+  "version": "6.2.8-dev.1",
   "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,6 +66,6 @@
     "@mikro-orm/core": "^6.2.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.2.8-dev.0"
+    "@mikro-orm/core": "6.2.8-dev.1"
   }
 }