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

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]}`;
@@ -740,19 +749,13 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         if (owners.length === 1 && (options.offset != null || options.limit != null)) {
             qb.limit(options.limit, options.offset);
         }
-        // console.log('pivot qb', qb, qb._fields);
         const res = owners.length ? await this.rethrow(qb.execute('all', { mergeResults: false, mapResults: false })) : [];
-        // console.log(res);
-        // const items = res.map((row: Dictionary) => super.mapResult(row, prop.targetMeta));
         const tmp = {};
-        // const items = res.map((row: Dictionary) => this.mapResult(row, prop.targetMeta!, populate, qb, tmp));
-        // const items = res.map((row: Dictionary) => this.mapResult(row, pivotMeta, populate, qb, tmp));
         const items = res.map((row) => {
             const root = super.mapResult(row, prop.targetMeta);
             this.mapJoinedProps(root, prop.targetMeta, populate, qb, root, tmp, pivotMeta.className + '.' + pivotProp1.name);
             return root;
         });
-        // console.log(prop.name, prop.targetMeta!.className, items);
         qb.clearRawFragmentsCache();
         const map = {};
         const pkProps = ownerMeta.getPrimaryProps();
@@ -889,7 +892,6 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             const prop = meta.properties[propName];
             // ignore ref joins of known FKs unless it's a filter hint
             if (ref && !hint.filter && (prop.kind === core_1.ReferenceKind.MANY_TO_ONE || (prop.kind === core_1.ReferenceKind.ONE_TO_ONE && !prop.owner))) {
-                // // console.log('wat', hint);
                 return;
             }
             const meta2 = this.metadata.find(prop.type);
@@ -923,11 +925,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 fields.push(...this.getFieldsForJoinedLoad(qb, meta2, childExplicitFields.length === 0 ? undefined : childExplicitFields, childExclude, hint.children, options, tableAlias, path));
             }
             else if (hint.filter) {
-                // fields.push(field);
                 fields.push(...prop.referencedColumnNames.map(col => qb.helper.mapper(`${tableAlias}.${col}`, qb.type, undefined, `${tableAlias}__${col}`)));
             }
         });
-        // // console.log(fields, joinedProps);
         return fields;
     }
     /**

package/package.json

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