@mikro-orm/sql 7.2.5-dev.4 → 7.2.5-dev.6

package/AbstractSqlDriver.js

@@ -2087,6 +2087,12 @@ export class AbstractSqlDriver extends DatabaseDriver {
         }
         const aliased = this.platform.quoteIdentifier(`${tableAlias}__${prop.fieldNames[0]}`);
         const sourceAlias = qb.helper.getTPTAliasForProperty(prop.name, tableAlias);
+        if (prop.formula) {
+            const quotedAlias = this.platform.quoteIdentifier(tableAlias).toString();
+            const table = this.createFormulaTable(quotedAlias, meta, schema);
+            const columns = meta.createColumnMappingObject(tableAlias);
+            return [raw(`${this.evaluateFormula(prop.formula, columns, table)} as ${aliased}`)];
+        }
         if (prop.customTypes?.some(type => !!type?.convertToJSValueSQL)) {
             return prop.fieldNames.map((col, idx) => {
                 if (!prop.customTypes[idx]?.convertToJSValueSQL) {
@@ -2101,12 +2107,6 @@ export class AbstractSqlDriver extends DatabaseDriver {
             const prefixed = this.platform.quoteIdentifier(`${sourceAlias}.${prop.fieldNames[0]}`);
             return [raw(`${prop.customType.convertToJSValueSQL(prefixed, this.platform)} as ${aliased}`)];
         }
-        if (prop.formula) {
-            const quotedAlias = this.platform.quoteIdentifier(tableAlias).toString();
-            const table = this.createFormulaTable(quotedAlias, meta, schema);
-            const columns = meta.createColumnMappingObject(tableAlias);
-            return [raw(`${this.evaluateFormula(prop.formula, columns, table)} as ${aliased}`)];
-        }
         return prop.fieldNames.map(fieldName => {
             return raw('?? as ??', [`${sourceAlias}.${fieldName}`, `${tableAlias}__${fieldName}`]);
         });
@@ -2527,7 +2527,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
                     const table = this.createFormulaTable(quotedAlias.toString(), meta, effectiveSchema);
                     ret.push(raw(`${this.evaluateFormula(prop.formula, columns, table)} as ${aliased}`));
                 }
-                if (!prop.object && (prop.hasConvertToDatabaseValueSQL || prop.hasConvertToJSValueSQL)) {
+                if (!prop.object && !prop.formula && (prop.hasConvertToDatabaseValueSQL || prop.hasConvertToJSValueSQL)) {
                     ret.push(prop.name);
                 }
             }

package/package.json

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