@mikro-orm/knex 6.0.0-dev.102 → 6.0.0-dev.103

package/AbstractSqlDriver.d.ts

@@ -16,10 +16,9 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
     find<T extends object, P extends string = never, F extends string = '*'>(entityName: string, where: FilterQuery<T>, options?: FindOptions<T, P, F>): Promise<EntityData<T>[]>;
     findOne<T extends object, P extends string = never, F extends string = '*'>(entityName: string, where: FilterQuery<T>, options?: FindOneOptions<T, P, F>): Promise<EntityData<T> | null>;
     findVirtual<T extends object>(entityName: string, where: FilterQuery<T>, options: FindOptions<T, any, any>): Promise<EntityData<T>[]>;
-    countVirtual<T extends object>(entityName: string, where: FilterQuery<T>, options: CountOptions<T>): Promise<number>;
-    protected wrapVirtualExpressionInSubquery<T extends object>(meta: EntityMetadata<T>, expression: string, where: FilterQuery<T>, options: FindOptions<T, any, any>, type: QueryType.COUNT): Promise<number>;
-    protected wrapVirtualExpressionInSubquery<T extends object>(meta: EntityMetadata<T>, expression: string, where: FilterQuery<T>, options: FindOptions<T, any, any>, type: QueryType.SELECT): Promise<T[]>;
-    protected wrapVirtualExpressionInSubquery<T extends object>(meta: EntityMetadata<T>, expression: string, where: FilterQuery<T>, options: FindOptions<T, any, any>): Promise<T[]>;
+    countVirtual<T extends object>(entityName: string, where: FilterQuery<T>, options: CountOptions<T, any>): Promise<number>;
+    protected findFromVirtual<T extends object>(entityName: string, where: FilterQuery<T>, options: FindOptions<T, any> | CountOptions<T, any>, type: QueryType): Promise<EntityData<T>[] | number>;
+    protected wrapVirtualExpressionInSubquery<T extends object>(meta: EntityMetadata<T>, expression: string, where: FilterQuery<T>, options: FindOptions<T, any>, type: QueryType): Promise<T[] | number>;
     mapResult<T extends object>(result: EntityData<T>, meta: EntityMetadata<T>, populate?: PopulateOptions<T>[], qb?: QueryBuilder<T>, map?: Dictionary): EntityData<T> | null;
     private mapJoinedProps;
     private appendToCollection;

package/AbstractSqlDriver.js

@@ -86,42 +86,38 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         return res[0] || null;
     }
     async findVirtual(entityName, where, options) {
-        const meta = this.metadata.get(entityName);
-        /* istanbul ignore next */
-        if (!meta.expression) {
-            return [];
-        }
-        if (typeof meta.expression === 'string') {
-            return this.wrapVirtualExpressionInSubquery(meta, meta.expression, where, options);
-        }
-        const em = this.createEntityManager(false);
-        em.setTransactionContext(options.ctx);
-        const res = meta.expression(em, where, options);
-        if (res instanceof query_1.QueryBuilder) {
-            return this.wrapVirtualExpressionInSubquery(meta, res.getFormattedQuery(), where, options);
-        }
-        /* istanbul ignore next */
-        return res;
+        return this.findFromVirtual(entityName, where, options, query_1.QueryType.SELECT);
     }
     async countVirtual(entityName, where, options) {
+        return this.findFromVirtual(entityName, where, options, query_1.QueryType.COUNT);
+    }
+    async findFromVirtual(entityName, where, options, type) {
         const meta = this.metadata.get(entityName);
         /* istanbul ignore next */
         if (!meta.expression) {
-            return 0;
+            return type === query_1.QueryType.SELECT ? [] : 0;
         }
         if (typeof meta.expression === 'string') {
-            return this.wrapVirtualExpressionInSubquery(meta, meta.expression, where, options, query_1.QueryType.COUNT);
+            return this.wrapVirtualExpressionInSubquery(meta, meta.expression, where, options, type);
         }
         const em = this.createEntityManager(false);
         em.setTransactionContext(options.ctx);
         const res = meta.expression(em, where, options);
+        if (typeof res === 'string') {
+            return this.wrapVirtualExpressionInSubquery(meta, res, where, options, type);
+        }
         if (res instanceof query_1.QueryBuilder) {
-            return this.wrapVirtualExpressionInSubquery(meta, res.getFormattedQuery(), where, options, query_1.QueryType.COUNT);
+            return this.wrapVirtualExpressionInSubquery(meta, res.getFormattedQuery(), where, options, type);
+        }
+        if (core_1.Utils.isObject(res)) {
+            const { sql, bindings } = res.toSQL();
+            const query = this.platform.formatQuery(sql, bindings);
+            return this.wrapVirtualExpressionInSubquery(meta, query, where, options, type);
         }
         /* istanbul ignore next */
         return res;
     }
-    async wrapVirtualExpressionInSubquery(meta, expression, where, options, type = query_1.QueryType.SELECT) {
+    async wrapVirtualExpressionInSubquery(meta, expression, where, options, type) {
         const qb = this.createQueryBuilder(meta.className, options?.ctx, options.connectionType, options.convertCustomTypes)
             .limit(options?.limit, options?.offset)
             .indexHint(options.indexHint)
@@ -174,10 +170,12 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 return root[`${relationAlias}__${name}`] != null;
             }));
             if (!hasPK) {
-                // initialize empty collections
                 if ([core_1.ReferenceKind.MANY_TO_MANY, core_1.ReferenceKind.ONE_TO_MANY].includes(relation.kind)) {
                     result[relation.name] ??= [];
                 }
+                if ([core_1.ReferenceKind.MANY_TO_ONE, core_1.ReferenceKind.ONE_TO_ONE].includes(relation.kind)) {
+                    result[relation.name] = null;
+                }
                 return;
             }
             const tz = this.platform.getTimezone();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.102",
+  "version": "6.0.0-dev.103",
   "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",
@@ -63,9 +63,9 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^5.8.1"
+    "@mikro-orm/core": "^5.8.3"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.102"
+    "@mikro-orm/core": "~6.0.0-dev.103"
   }
 }

package/query/QueryBuilder.js

@@ -734,7 +734,8 @@ class QueryBuilder {
                 return;
             }
             if (prop?.embedded) {
-                const fieldName = this.helper.mapper(prop.fieldNames[0], this.type);
+                const name = this._aliases[a] ? `${a}.${prop.fieldNames[0]}` : prop.fieldNames[0];
+                const fieldName = this.helper.mapper(name, this.type);
                 ret.push(fieldName);
                 return;
             }