@mikro-orm/sql 7.1.0-dev.39 → 7.1.0-dev.40

package/AbstractSqlDriver.js

@@ -1960,18 +1960,19 @@ export class AbstractSqlDriver extends DatabaseDriver {
             });
         }
         const aliased = this.platform.quoteIdentifier(`${tableAlias}__${prop.fieldNames[0]}`);
+        const sourceAlias = qb.helper.getTPTAliasForProperty(prop.name, tableAlias);
         if (prop.customTypes?.some(type => !!type?.convertToJSValueSQL)) {
             return prop.fieldNames.map((col, idx) => {
                 if (!prop.customTypes[idx]?.convertToJSValueSQL) {
                     return col;
                 }
-                const prefixed = this.platform.quoteIdentifier(`${tableAlias}.${col}`);
+                const prefixed = this.platform.quoteIdentifier(`${sourceAlias}.${col}`);
                 const aliased = this.platform.quoteIdentifier(`${tableAlias}__${col}`);
                 return raw(`${prop.customTypes[idx].convertToJSValueSQL(prefixed, this.platform)} as ${aliased}`);
             });
         }
         if (prop.customType?.convertToJSValueSQL) {
-            const prefixed = this.platform.quoteIdentifier(`${tableAlias}.${prop.fieldNames[0]}`);
+            const prefixed = this.platform.quoteIdentifier(`${sourceAlias}.${prop.fieldNames[0]}`);
             return [raw(`${prop.customType.convertToJSValueSQL(prefixed, this.platform)} as ${aliased}`)];
         }
         if (prop.formula) {
@@ -1980,7 +1981,6 @@ export class AbstractSqlDriver extends DatabaseDriver {
             const columns = meta.createColumnMappingObject(tableAlias);
             return [raw(`${this.evaluateFormula(prop.formula, columns, table)} as ${aliased}`)];
         }
-        const sourceAlias = qb.helper.getTPTAliasForProperty(prop.name, tableAlias);
         return prop.fieldNames.map(fieldName => {
             return raw('?? as ??', [`${sourceAlias}.${fieldName}`, `${tableAlias}__${fieldName}`]);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.0-dev.39",
+  "version": "7.1.0-dev.40",
   "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.0.16"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.0-dev.39"
+    "@mikro-orm/core": "7.1.0-dev.40"
   },
   "engines": {
     "node": ">= 22.17.0"