@mikro-orm/sql 7.2.6-dev.3 → 7.2.6-dev.30

package/AbstractSqlConnection.js

@@ -130,6 +130,10 @@ export class AbstractSqlConnection extends Connection {
             }
             catch (rollbackError) {
                 this.logger.warn('query', `Failed to roll back transaction: ${rollbackError.message}`);
+                // the inner writes are still part of the outer transaction, so it must not commit them
+                if (options.ctx) {
+                    options.ctx.failedSavepointRollback ??= new Error(`Cannot commit the transaction, rolling back to savepoint "${trx.savepointName}" failed: ${rollbackError.message}`, { cause: rollbackError });
+                }
             }
             throw error;
         }
@@ -203,6 +207,9 @@ export class AbstractSqlConnection extends Connection {
         if (ctx.isRolledBack) {
             return;
         }
+        if ('failedSavepointRollback' in ctx) {
+            throw ctx.failedSavepointRollback;
+        }
         await eventBroadcaster?.dispatchEvent(EventType.beforeTransactionCommit, ctx);
         if ('savepointName' in ctx) {
             await ctx.releaseSavepoint(ctx.savepointName).execute();

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
@@ -825,11 +828,11 @@ export class AbstractSqlDriver extends DatabaseDriver {
                     value = this.platform.cloneEmbeddable(value);
                     for (let i = 0; i < value.length; i++) {
                         const item = value[i];
-                        value[i] = this.mapDataToFieldNames(item, false, prop.embeddedProps, options.convertCustomTypes);
+                        value[i] = this.mapDataToFieldNames(item, false, this.variantProps(prop, item), options.convertCustomTypes);
                     }
                 }
                 else {
-                    value = this.mapDataToFieldNames(value, false, prop.embeddedProps, options.convertCustomTypes);
+                    value = this.mapDataToFieldNames(value, false, this.variantProps(prop, value), options.convertCustomTypes);
                 }
             }
             if (typeof value === 'undefined' && this.platform.usesDefaultKeyword()) {
@@ -1095,11 +1098,11 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 if (prop.array && value) {
                     for (let i = 0; i < value.length; i++) {
                         const item = value[i];
-                        value[i] = this.mapDataToFieldNames(item, false, prop.embeddedProps, options.convertCustomTypes);
+                        value[i] = this.mapDataToFieldNames(item, false, this.variantProps(prop, item), options.convertCustomTypes);
                     }
                 }
                 else {
-                    value = this.mapDataToFieldNames(value, false, prop.embeddedProps, options.convertCustomTypes);
+                    value = this.mapDataToFieldNames(value, false, this.variantProps(prop, value), options.convertCustomTypes);
                 }
             }
             params.push(value ?? null);
@@ -2115,7 +2118,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
         if (prop.formula) {
             const quotedAlias = this.platform.quoteIdentifier(tableAlias).toString();
             const table = this.createFormulaTable(quotedAlias, meta, schema);
-            const columns = meta.createColumnMappingObject(p => qb.helper.getTPTAliasForProperty(p.name, tableAlias), tableAlias);
+            const columns = meta.createColumnMappingObject(p => qb.helper.getTPTAliasForProperty(p.name, tableAlias), quotedAlias);
             return [raw(`${this.evaluateFormula(prop.formula, columns, table)} as ${aliased}`)];
         }
         if (prop.customTypes?.some(type => !!type?.convertToJSValueSQL)) {
@@ -2539,9 +2542,9 @@ export class AbstractSqlDriver extends DatabaseDriver {
             ret.push('*');
         }
         if (ret.length > 0 && !hasExplicitFields && addFormulas) {
-            // Create formula column mapping with unquoted aliases - quoting should be handled by the user via `quote` helper
+            // `toString()` must yield the quoted alias like `QueryBuilder.finalize()`, which dedupes formulas by rendered SQL
             const quotedAlias = this.platform.quoteIdentifier(alias);
-            const columns = meta.createColumnMappingObject(alias);
+            const columns = meta.createColumnMappingObject(alias, quotedAlias.toString());
             const effectiveSchema = schema ?? (meta.schema !== '*' ? meta.schema : undefined);
             for (const prop of meta.props) {
                 if (lazyProps.includes(prop)) {

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/dialects/postgresql/PostgreSqlSchemaHelper.js

@@ -330,10 +330,9 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         return columnDefs.map(colDef => {
             const name = unquote(colDef);
             const result = { name };
-            // Find this column in the expression and extract modifiers
-            // Create a pattern that matches the column name (quoted or unquoted) followed by modifiers
+            // Match the column (quoted or unquoted) as a whole list item, so `id` never matches inside `author_id`
             const escapedName = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-            const colPattern = new RegExp(`"?${escapedName}"?\\s*([^,)]*?)(?:,|$)`, 'i');
+            const colPattern = new RegExp(`(?:^|,)\\s*"?${escapedName}"?(?=\\s|,|$)\\s*([^,)]*?)(?:,|$)`, 'i');
             const colMatch = columnsStr.match(colPattern);
             if (colMatch) {
                 const modifiers = colMatch[1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.2.6-dev.3",
+  "version": "7.2.6-dev.30",
   "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",
@@ -47,13 +47,13 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "kysely": "0.29.6"
+    "kysely": "0.29.7"
   },
   "devDependencies": {
     "@mikro-orm/core": "^7.2.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.6-dev.3"
+    "@mikro-orm/core": "7.2.6-dev.30"
   },
   "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/DatabaseTable.js

@@ -924,6 +924,17 @@ export class DatabaseTable {
                 };
                 return [expand(rootProp, 1)];
             }
+            // object embedded property index, the JSON keys are the field names of the embedded properties
+            if (rootProp?.embeddable && rootProp.object && rootProp.embeddedProps[parts[1]]) {
+                let p = rootProp.embeddedProps[parts[1]];
+                let i = 2;
+                while (i < parts.length && p.embeddedProps?.[parts[i]]) {
+                    p = p.embeddedProps[parts[i]];
+                    i++;
+                }
+                // a path below the last embedded property targets plain JSON keys, kept as they are
+                return [[...p.embeddedPath, ...parts.slice(i)].join('.')];
+            }
             // json index, we need to rename the column only
             if (rootProp) {
                 return [prop.replace(root, rootProp.fieldNames[0])];

package/schema/SchemaComparator.js

@@ -866,16 +866,10 @@ export class SchemaComparator {
         if (cols1.length === 0 && cols2.length === 0) {
             return true;
         }
-        // If only one has column options, they don't match
-        if (cols1.length !== cols2.length) {
-            return false;
-        }
-        // Compare each column's options
-        // Note: We don't check c1.name !== c2.name because the indexes already have matching columnNames
-        // and the columns array is derived from those same column names
-        for (let i = 0; i < cols1.length; i++) {
-            const c1 = cols1[i];
-            const c2 = cols2[i];
+        // introspection may omit entries for columns with default options, so match them by name
+        for (const name of index1.columnNames) {
+            const c1 = cols1.find(c => c.name === name) ?? { name };
+            const c2 = cols2.find(c => c.name === name) ?? { name };
             const sort1 = c1.sort?.toUpperCase() ?? 'ASC';
             const sort2 = c2.sort?.toUpperCase() ?? 'ASC';
             if (sort1 !== sort2) {

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}`);
         }