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

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/index.mjs

@@ -241,6 +241,7 @@ export const expandDotPaths = mod.expandDotPaths;
 export const getLoadingStrategy = mod.getLoadingStrategy;
 export const getOnConflictFields = mod.getOnConflictFields;
 export const getOnConflictReturningFields = mod.getOnConflictReturningFields;
+export const getWhereCondition = mod.getWhereCondition;
 export const helper = mod.helper;
 export const knex = mod.knex;
 export const parseJsonSafe = mod.parseJsonSafe;

package/package.json

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

package/schema/DatabaseTable.js

@@ -109,33 +109,34 @@ class DatabaseTable {
             if (prop.referencedTableName.includes('.')) {
                 schema = undefined;
             }
-            this.foreignKeys[constraintName] = {
-                constraintName,
-                columnNames: prop.fieldNames,
-                localTableName: this.getShortestName(),
-                referencedColumnNames: prop.referencedColumnNames,
-                referencedTableName: schema ? `${schema}.${prop.referencedTableName}` : prop.referencedTableName,
-                createForeignKeyConstraint: prop.createForeignKeyConstraint,
-            };
-            const cascade = prop.cascade.includes(core_1.Cascade.REMOVE) || prop.cascade.includes(core_1.Cascade.ALL);
-            if (prop.deleteRule || cascade || prop.nullable) {
-                this.foreignKeys[constraintName].deleteRule = prop.deleteRule || (cascade ? 'cascade' : 'set null');
-            }
-            if (prop.updateRule) {
-                this.foreignKeys[constraintName].updateRule = prop.updateRule || 'cascade';
-            }
-            if ((prop.cascade.includes(core_1.Cascade.PERSIST) || prop.cascade.includes(core_1.Cascade.ALL))) {
-                const hasCascadePath = Object.values(this.foreignKeys).some(fk => {
-                    return fk.constraintName !== constraintName
-                        && ((fk.updateRule && fk.updateRule !== 'no action') || (fk.deleteRule && fk.deleteRule !== 'no action'))
-                        && fk.referencedTableName === this.foreignKeys[constraintName].referencedTableName;
-                });
-                if (!hasCascadePath || this.platform.supportsMultipleCascadePaths()) {
-                    this.foreignKeys[constraintName].updateRule ??= 'cascade';
+            if (prop.createForeignKeyConstraint) {
+                this.foreignKeys[constraintName] = {
+                    constraintName,
+                    columnNames: prop.fieldNames,
+                    localTableName: this.getShortestName(),
+                    referencedColumnNames: prop.referencedColumnNames,
+                    referencedTableName: schema ? `${schema}.${prop.referencedTableName}` : prop.referencedTableName,
+                };
+                const cascade = prop.cascade.includes(core_1.Cascade.REMOVE) || prop.cascade.includes(core_1.Cascade.ALL);
+                if (prop.deleteRule || cascade || prop.nullable) {
+                    this.foreignKeys[constraintName].deleteRule = prop.deleteRule || (cascade ? 'cascade' : 'set null');
+                }
+                if (prop.updateRule) {
+                    this.foreignKeys[constraintName].updateRule = prop.updateRule || 'cascade';
+                }
+                if ((prop.cascade.includes(core_1.Cascade.PERSIST) || prop.cascade.includes(core_1.Cascade.ALL))) {
+                    const hasCascadePath = Object.values(this.foreignKeys).some(fk => {
+                        return fk.constraintName !== constraintName
+                            && ((fk.updateRule && fk.updateRule !== 'no action') || (fk.deleteRule && fk.deleteRule !== 'no action'))
+                            && fk.referencedTableName === this.foreignKeys[constraintName].referencedTableName;
+                    });
+                    if (!hasCascadePath || this.platform.supportsMultipleCascadePaths()) {
+                        this.foreignKeys[constraintName].updateRule ??= 'cascade';
+                    }
+                }
+                if (prop.deferMode) {
+                    this.foreignKeys[constraintName].deferMode = prop.deferMode;
                 }
-            }
-            if (prop.deferMode) {
-                this.foreignKeys[constraintName].deferMode = prop.deferMode;
             }
         }
         if (prop.index) {

package/schema/SchemaComparator.js

@@ -268,7 +268,7 @@ class SchemaComparator {
         }
         for (const toConstraint of Object.values(toForeignKeys)) {
             tableDifferences.addedForeignKeys[toConstraint.constraintName] = toConstraint;
-            this.log(`FK constraint ${toConstraint.constraintName} added from table ${tableDifferences.name}`, { constraint: toConstraint });
+            this.log(`FK constraint ${toConstraint.constraintName} added to table ${tableDifferences.name}`, { constraint: toConstraint });
             changes++;
         }
         return changes ? tableDifferences : false;

package/schema/SchemaHelper.js

@@ -321,7 +321,7 @@ class SchemaHelper {
         });
     }
     createForeignKey(table, foreignKey, schema) {
-        if (!this.options.createForeignKeyConstraints || !foreignKey.createForeignKeyConstraint) {
+        if (!this.options.createForeignKeyConstraints) {
             return;
         }
         const builder = table

package/typings.d.ts

@@ -60,7 +60,6 @@ export interface ForeignKey {
     updateRule?: string;
     deleteRule?: string;
     deferMode?: DeferMode;
-    createForeignKeyConstraint: boolean;
 }
 export interface IndexDef {
     columnNames: string[];