@mikro-orm/knex 6.5.8-dev.1 → 6.5.8-dev.10

package/AbstractSqlDriver.d.ts

@@ -52,6 +52,7 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
      * @internal
      */
     mergeJoinedResult<T extends object>(rawResults: EntityData<T>[], meta: EntityMetadata<T>, joinedProps: PopulateOptions<T>[]): EntityData<T>[];
+    protected shouldHaveColumn<T, U>(meta: EntityMetadata<T>, prop: EntityProperty<U>, populate: PopulateOptions<U>[], fields?: Field<U>[], exclude?: Field<U>[]): boolean;
     protected getFieldsForJoinedLoad<T extends object>(qb: QueryBuilder<T, any, any, any>, meta: EntityMetadata<T>, explicitFields?: Field<T>[], exclude?: Field<T>[], populate?: PopulateOptions<T>[], options?: {
         strategy?: Options['loadStrategy'];
         populateWhere?: FindOptions<any>['populateWhere'];
@@ -60,7 +61,7 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
     /**
      * @internal
      */
-    mapPropToFieldNames<T extends object>(qb: QueryBuilder<T, any, any, any>, prop: EntityProperty<T>, tableAlias?: string): Field<T>[];
+    mapPropToFieldNames<T extends object>(qb: QueryBuilder<T, any, any, any>, prop: EntityProperty<T>, tableAlias?: string, explicitFields?: Field<T>[]): Field<T>[];
     /** @internal */
     createQueryBuilder<T extends object>(entityName: EntityName<T> | QueryBuilder<T, any, any, any>, ctx?: Transaction<Knex.Transaction>, preferredConnectionType?: ConnectionType, convertCustomTypes?: boolean, loggerContext?: LoggingOptions, alias?: string, em?: SqlEntityManager): QueryBuilder<T, any, any, any>;
     protected resolveConnectionType(args: {

package/AbstractSqlDriver.js

@@ -922,25 +922,25 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         }
         return res;
     }
+    shouldHaveColumn(meta, prop, populate, fields, exclude) {
+        if (!this.platform.shouldHaveColumn(prop, populate, exclude)) {
+            return false;
+        }
+        if (!fields || fields.includes('*') || prop.primary || meta.root.discriminatorColumn === prop.name) {
+            return true;
+        }
+        return fields.some(f => f === prop.name || f.toString().startsWith(prop.name + '.'));
+    }
     getFieldsForJoinedLoad(qb, meta, explicitFields, exclude, populate = [], options, parentTableAlias, parentJoinPath) {
         const fields = [];
         const joinedProps = this.joinedProps(meta, populate, options);
-        const shouldHaveColumn = (meta, prop, populate, fields) => {
-            if (!this.platform.shouldHaveColumn(prop, populate, exclude)) {
-                return false;
-            }
-            if (!fields || fields.includes('*') || prop.primary || meta.root.discriminatorColumn === prop.name) {
-                return true;
-            }
-            return fields.some(f => f === prop.name || f.toString().startsWith(prop.name + '.'));
-        };
         const populateWhereAll = options?._populateWhere === 'all' || core_1.Utils.isEmpty(options?._populateWhere);
         // root entity is already handled, skip that
         if (parentJoinPath) {
             // alias all fields in the primary table
             meta.props
-                .filter(prop => shouldHaveColumn(meta, prop, populate, explicitFields))
-                .forEach(prop => fields.push(...this.mapPropToFieldNames(qb, prop, parentTableAlias)));
+                .filter(prop => this.shouldHaveColumn(meta, prop, populate, explicitFields, exclude))
+                .forEach(prop => fields.push(...this.mapPropToFieldNames(qb, prop, parentTableAlias, explicitFields)));
         }
         for (const hint of joinedProps) {
             const [propName, ref] = hint.field.split(':', 2);
@@ -991,10 +991,14 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
     /**
      * @internal
      */
-    mapPropToFieldNames(qb, prop, tableAlias) {
+    mapPropToFieldNames(qb, prop, tableAlias, explicitFields) {
         if (prop.kind === core_1.ReferenceKind.EMBEDDED && !prop.object) {
-            return Object.values(prop.embeddedProps).flatMap(childProp => {
-                return this.mapPropToFieldNames(qb, childProp, tableAlias);
+            return Object.entries(prop.embeddedProps).flatMap(([name, childProp]) => {
+                const childFields = explicitFields ? core_1.Utils.extractChildElements(explicitFields, prop.name) : [];
+                if (childFields.length > 0 && !this.shouldHaveColumn(prop.targetMeta, { ...childProp, name }, [], childFields)) {
+                    return [];
+                }
+                return this.mapPropToFieldNames(qb, childProp, tableAlias, childFields);
             });
         }
         const aliased = this.platform.quoteIdentifier(tableAlias ? `${tableAlias}__${prop.fieldNames[0]}` : prop.fieldNames[0]);
@@ -1286,7 +1290,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             }
         }
         else if (!core_1.Utils.isEmpty(options.exclude) || lazyProps.some(p => !p.formula && (p.kind !== '1:1' || p.owner))) {
-            const props = meta.props.filter(prop => this.platform.shouldHaveColumn(prop, populate, options.exclude, false));
+            const props = meta.props.filter(prop => this.platform.shouldHaveColumn(prop, populate, options.exclude, false, false));
             ret.push(...props.filter(p => !lazyProps.includes(p)).map(p => p.name));
             addFormulas = true;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.5.8-dev.1",
+  "version": "6.5.8-dev.10",
   "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.5.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.5.8-dev.1",
+    "@mikro-orm/core": "6.5.8-dev.10",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/QueryBuilder.js

@@ -1310,10 +1310,11 @@ class QueryBuilder {
                 }
                 else if (join.parent?.type === enums_1.JoinType.nestedInnerJoin) {
                     const group = lookupParentGroup(join.parent);
+                    const nested = group ?? ((join.parent).nested ??= new Set());
                     join.type = join.type === enums_1.JoinType.innerJoin
                         ? enums_1.JoinType.nestedInnerJoin
                         : enums_1.JoinType.nestedLeftJoin;
-                    group?.add(join);
+                    nested.add(join);
                 }
             }
         }

package/schema/DatabaseSchema.js

@@ -108,10 +108,15 @@ class DatabaseSchema {
             table.addIndex(meta, { properties: meta.props.filter(prop => prop.primary).map(prop => prop.name) }, 'primary');
             meta.checks.forEach(check => {
                 const columnName = check.property ? meta.properties[check.property].fieldNames[0] : undefined;
+                let expression = check.expression;
+                const raw = core_1.RawQueryFragment.getKnownFragment(expression);
+                if (raw) {
+                    expression = platform.formatQuery(raw.sql, raw.params);
+                }
                 table.addCheck({
                     name: check.name,
-                    expression: check.expression,
-                    definition: `check ((${check.expression}))`,
+                    expression,
+                    definition: `check ((${expression}))`,
                     columnName,
                 });
             });