@mikro-orm/sql 7.2.6-dev.22 → 7.2.6-dev.24

package/AbstractSqlDriver.js

@@ -467,9 +467,14 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 return;
             }
             const mapToPk = !hint.dataOnly && !!(ref || prop.mapToPk);
-            const targetProps = mapToPk
-                ? meta2.getPrimaryProps()
-                : meta2.props.filter(prop => this.platform.shouldHaveColumn(prop, hint.children || []));
+            // all rows of a result share their columns, so resolve the mapped props once per join path
+            const joinedTargets = (map.joinedTargets ??= {});
+            const { targetProps, virtualProps } = (joinedTargets[path] ??= {
+                targetProps: (mapToPk
+                    ? meta2.getPrimaryProps()
+                    : meta2.props.filter(prop => this.platform.shouldHaveColumn(prop, hint.children || []))).filter(prop => prop.fieldNames.some(name => typeof root[`${relationAlias}__${name}`] !== 'undefined')),
+                virtualProps: meta2.props.filter(prop => !ref && prop.persist === false && prop.fieldNames),
+            });
             // If the primary key value for the relation is null, we know we haven't joined to anything
             // and therefore we don't return any record (since all values would be null)
             const hasPK = meta2.getPrimaryProps().every(pk => pk.fieldNames.every(name => {
@@ -490,9 +495,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 return;
             }
             let relationPojo = {};
-            meta2.props
-                .filter(prop => !ref && prop.persist === false && prop.fieldNames)
-                .forEach(prop => {
+            virtualProps.forEach(prop => {
                 /* v8 ignore next */
                 if (prop.fieldNames.length > 1) {
                     // composite keys

package/dialects/mysql/MySqlSchemaHelper.js

@@ -1,4 +1,4 @@
-import { EnumType, StringType, TextType } from '@mikro-orm/core';
+import { EnumType, JsonType, StringType, TextType, } from '@mikro-orm/core';
 import { SchemaHelper } from '../../schema/SchemaHelper.js';
 export class MySqlSchemaHelper extends SchemaHelper {
     #cache = {};
@@ -601,7 +601,17 @@ export class MySqlSchemaHelper extends SchemaHelper {
         return super.normalizeDefaultValue(defaultValue, length, MySqlSchemaHelper.DEFAULT_VALUES);
     }
     wrap(val, type) {
+        if (typeof val !== 'string' || val.length === 0) {
+            return val;
+        }
+        // text/blob literal defaults come back escaped twice with a charset introducer, e.g. `_utf8mb4\'it\\\'s\'` (JSON is parsed by the comparator)
+        const expression = type instanceof JsonType ? null : /^_\w+\\'(.*)\\'$/s.exec(val);
+        if (expression) {
+            const unescape = (str, escapes = {}) => str.replace(/\\(.)/gs, (_, char) => escapes[char] ?? char);
+            const sqlEscapes = { 0: '\0', b: '\b', n: '\n', r: '\r', t: '\t', Z: '\x1a' };
+            return this.platform.quoteValue(unescape(unescape(expression[1]), sqlEscapes));
+        }
         const stringType = type instanceof StringType || type instanceof TextType || type instanceof EnumType;
-        return typeof val === 'string' && val.length > 0 && stringType ? this.platform.quoteValue(val) : val;
+        return stringType ? this.platform.quoteValue(val) : val;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.2.6-dev.22",
+  "version": "7.2.6-dev.24",
   "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.",
   "keywords": [
     "data-mapper",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.2.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.6-dev.22"
+    "@mikro-orm/core": "7.2.6-dev.24"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/ObjectCriteriaNode.js

@@ -57,6 +57,8 @@ export class ObjectCriteriaNode extends CriteriaNode {
                     // schema-less entities the schema is resolved dynamically and needs to be carried over
                     const fixedSchema = parentMeta.schema && parentMeta.schema !== '*';
                     const qb2 = qb.clone(true, fixedSchema ? undefined : ['schema']);
+                    // the payload was already converted when processing the parent query
+                    qb2.unsetFlag(QueryFlag.CONVERT_CUSTOM_TYPES);
                     const joinAlias = qb2.getNextAlias(this.prop.targetMeta.class);
                     const sub = qb2
                         .from(parentMeta.class)

package/query/QueryBuilder.js

@@ -1157,8 +1157,9 @@ export class QueryBuilder {
         const hash = (data) => {
             return Utils.getPrimaryKeyHash(meta.primaryKeys.map(pk => data[pk]));
         };
+        const map = {};
         for await (const row of res) {
-            const mapped = this.driver.mapResult(row, meta, this.#state.populate, this);
+            const mapped = this.driver.mapResult(row, meta, this.#state.populate, this, map);
             if (!options.mergeResults || joinedProps.length === 0) {
                 yield this.mapResult(mapped, options.mapResults);
                 continue;

package/schema/SchemaHelper.js

@@ -614,6 +614,8 @@ export class SchemaHelper {
         }
         if (useDefault) {
             // https://dev.mysql.com/doc/refman/9.0/en/data-type-defaults.html
+            // `tinytext`, `mediumtext`, `longblob` etc. follow the same rule as `text` and `blob`
+            const baseType = column.type.toLowerCase().replace(/^(tiny|medium|long)/, '');
             const needsExpression = [
                 'blob',
                 'text',
@@ -625,7 +627,7 @@ export class SchemaHelper {
                 'multilinestring',
                 'multipolygon',
                 'geometrycollection',
-            ].some(type => column.type.toLowerCase().startsWith(type));
+            ].some(type => baseType.startsWith(type));
             const defaultSql = needsExpression && !column.default.startsWith('(') ? `(${column.default})` : column.default;
             col.push(`default ${defaultSql}`);
         }