@mikro-orm/knex 6.2.10-dev.46 → 6.2.10-dev.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.2.10-dev.46",
+  "version": "6.2.10-dev.48",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -66,7 +66,7 @@
     "@mikro-orm/core": "^6.2.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.2.10-dev.46",
+    "@mikro-orm/core": "6.2.10-dev.48",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/QueryBuilder.js

@@ -1224,7 +1224,7 @@ class 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)) {
+                    if (!prop?.persist && !prop?.formula && !prop?.hasConvertToJSValueSQL && !pks.includes(fieldName)) {
                         addToSelect.push(fieldName);
                     }
                     const key = (0, core_1.raw)(`min(${this.knex.ref(fieldName)}${type})`);
@@ -1247,8 +1247,10 @@ class QueryBuilder {
                     }
                     return false;
                 });
+                /* istanbul ignore next */
                 if (field instanceof core_1.RawQueryFragment) {
-                    knexQuery.select(this.platform.formatQuery(field.sql, field.params));
+                    const sql = this.platform.formatQuery(field.sql, field.params);
+                    knexQuery.select(this.knex.raw(sql));
                 }
                 else if (field) {
                     knexQuery.select(field);