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

package/AbstractSqlDriver.js

@@ -2115,7 +2115,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 +2539,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/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.20",
+  "version": "7.2.6-dev.22",
   "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.20"
+    "@mikro-orm/core": "7.2.6-dev.22"
   },
   "engines": {
     "node": ">= 22.17.0"

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])];