@mikro-orm/knex 6.5.7-dev.8 → 6.5.7

package/AbstractSqlDriver.d.ts

@@ -75,7 +75,7 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
     protected buildPopulateOrderBy<T extends object>(qb: QueryBuilder<T, any, any, any>, meta: EntityMetadata<T>, populateOrderBy: QueryOrderMap<T>[], parentPath: string, explicit: boolean, parentAlias?: string): QueryOrderMap<T>[];
     protected buildJoinedPropsOrderBy<T extends object>(qb: QueryBuilder<T, any, any, any>, meta: EntityMetadata<T>, populate: PopulateOptions<T>[], options?: Pick<FindOptions<any>, 'strategy' | 'orderBy' | 'populateOrderBy'>, parentPath?: string): QueryOrderMap<T>[];
     protected normalizeFields<T extends object>(fields: Field<T>[], prefix?: string): string[];
-    protected processField<T extends object>(meta: EntityMetadata<T>, prop: EntityProperty<T> | undefined, field: string, ret: Field<T>[], populate: PopulateOptions<T>[], joinedProps: PopulateOptions<T>[], qb: QueryBuilder<T, any, any, any>): void;
+    protected processField<T extends object>(meta: EntityMetadata<T>, prop: EntityProperty<T> | undefined, field: string, ret: Field<T>[]): void;
     protected isPopulated<T extends object>(meta: EntityMetadata<T>, prop: EntityProperty<T>, hint: PopulateOptions<T>, name?: string): boolean;
     protected buildFields<T extends object>(meta: EntityMetadata<T>, populate: PopulateOptions<T>[], joinedProps: PopulateOptions<T>[], qb: QueryBuilder<T, any, any, any>, alias: string, options: Pick<FindOptions<T, any, any, any>, 'strategy' | 'fields' | 'exclude'>): Field<T>[];
 }

package/AbstractSqlDriver.js

@@ -992,6 +992,11 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
      * @internal
      */
     mapPropToFieldNames(qb, prop, tableAlias) {
+        if (prop.kind === core_1.ReferenceKind.EMBEDDED && !prop.object) {
+            return Object.values(prop.embeddedProps).flatMap(childProp => {
+                return this.mapPropToFieldNames(qb, childProp, tableAlias);
+            });
+        }
         const aliased = this.platform.quoteIdentifier(tableAlias ? `${tableAlias}__${prop.fieldNames[0]}` : prop.fieldNames[0]);
         if (tableAlias && prop.customTypes?.some(type => type?.convertToJSValueSQL)) {
             return prop.fieldNames.map((col, idx) => {
@@ -1216,7 +1221,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         }
         return ret;
     }
-    processField(meta, prop, field, ret, populate, joinedProps, qb) {
+    processField(meta, prop, field, ret) {
         if (!prop || (prop.kind === core_1.ReferenceKind.ONE_TO_ONE && !prop.owner)) {
             return;
         }
@@ -1229,7 +1234,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             const top = parts.shift();
             for (const key of Object.keys(prop.embeddedProps)) {
                 if (!top || key === top) {
-                    this.processField(meta, prop.embeddedProps[key], parts.join('.'), ret, populate, joinedProps, qb);
+                    this.processField(meta, prop.embeddedProps[key], parts.join('.'), ret);
                 }
             }
             return;
@@ -1271,7 +1276,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     where: {},
                     aliasMap: qb.getAliasMap(),
                 });
-                this.processField(meta, prop, parts.join('.'), ret, populate, joinedProps, qb);
+                this.processField(meta, prop, parts.join('.'), ret);
             }
             if (!options.fields.includes('*') && !options.fields.includes(`${qb.alias}.*`)) {
                 ret.unshift(...meta.primaryKeys.filter(pk => !options.fields.includes(pk)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.5.7-dev.8",
+  "version": "6.5.7",
   "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,10 +63,10 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.5.6"
+    "@mikro-orm/core": "^6.5.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.5.7-dev.8",
+    "@mikro-orm/core": "^6.0.0",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/QueryBuilderHelper.js

@@ -281,6 +281,10 @@ class QueryBuilderHelper {
         }
         const [fromAlias, fromField] = this.splitField(key);
         const prop = this.getProperty(fromField, fromAlias);
+        if (core_1.Utils.isPlainObject(value) && prop?.kind === core_1.ReferenceKind.EMBEDDED) {
+            const parts = Object.entries(value).map(([k, v]) => this.processJoinClause(`${alias}.${prop.embeddedProps[k].name}`, v, alias, params));
+            return this.wrapQueryGroup(parts);
+        }
         operator = operator === '$not' ? '$eq' : operator;
         const column = this.mapper(key, undefined, undefined, null);
         if (value === null) {