@mikro-orm/mariadb 7.1.6-dev.9 → 7.1.6

package/MariaDbQueryBuilder.js

@@ -1,4 +1,4 @@
-import { isRaw, raw, RawQueryFragment, Utils, } from '@mikro-orm/core';
+import { raw, RawQueryFragment, Utils } from '@mikro-orm/core';
 import { QueryBuilder } from '@mikro-orm/mysql';
 /**
  * @inheritDoc
@@ -16,7 +16,6 @@ export class MariaDbQueryBuilder extends QueryBuilder {
         if (this.state.offset) {
             subQuery.offset(this.state.offset);
         }
-        const addToSelect = [];
         if (this.state.orderBy.length > 0) {
             const orderBy = [];
             for (const orderMap of this.state.orderBy) {
@@ -30,38 +29,18 @@ export class MariaDbQueryBuilder extends QueryBuilder {
                     const prop = this.helper.getProperty(f, a);
                     const type = this.platform.castColumn(prop);
                     const fieldName = this.helper.mapper(field, this.type, undefined, null);
-                    if (!prop?.persist && !prop?.formula && !pks.includes(fieldName)) {
-                        addToSelect.push(fieldName);
-                    }
-                    const key = raw(`min(${this.platform.quoteIdentifier(fieldName)}${type})`);
-                    orderBy.push({ [key]: direction });
+                    // virtual fields (e.g. `qb.as(...)`) have no column to reference inside `min()`; inline their expression
+                    const virtual = !prop?.persist && !prop?.formula && !pks.includes(fieldName)
+                        ? this.resolveVirtualField(f, fieldName)
+                        : undefined;
+                    const expr = virtual ? virtual.expr : this.platform.quoteIdentifier(fieldName);
+                    orderBy.push({ [raw(`min(${expr}${type})`)]: direction });
                 }
             }
             subQuery.orderBy(orderBy);
         }
         subQuery.state.finalized = true;
         const innerQuery = subQuery.as(this.mainAlias.aliasName).clear('select').select(pks);
-        /* v8 ignore next */
-        if (addToSelect.length > 0) {
-            addToSelect.forEach(prop => {
-                const field = this.state.fields.find(field => {
-                    if (typeof field === 'object' && field && '__as' in field) {
-                        return field.__as === prop;
-                    }
-                    if (isRaw(field)) {
-                        // not perfect, but should work most of the time, ideally we should check only the alias (`... as alias`)
-                        return field.sql.includes(prop);
-                    }
-                    return false;
-                });
-                if (isRaw(field)) {
-                    innerQuery.select(this.platform.formatQuery(field.sql, field.params));
-                }
-                else if (field) {
-                    innerQuery.select(field);
-                }
-            });
-        }
         // multiple sub-queries are needed to get around mysql limitations with order by + limit + where in + group by (o.O)
         // https://stackoverflow.com/questions/17892762/mysql-this-version-of-mysql-doesnt-yet-support-limit-in-all-any-some-subqu
         const subSubQuery = this.platform.createNativeQueryBuilder();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mariadb",
-  "version": "7.1.6-dev.9",
+  "version": "7.1.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",
@@ -47,14 +47,14 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "@mikro-orm/mysql": "7.1.6-dev.9",
-    "kysely": "0.29.2"
+    "@mikro-orm/mysql": "7.1.6",
+    "kysely": "0.29.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.1.5"
+    "@mikro-orm/core": "^7.1.6"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.6-dev.9"
+    "@mikro-orm/core": "7.1.6"
   },
   "engines": {
     "node": ">= 22.17.0"