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

package/AbstractSqlDriver.js

@@ -739,7 +739,8 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 }
                 else {
                     const targetMeta = coll.property.targetMeta;
-                    schema = targetMeta.schema === '*' ? options?.schema ?? this.config.get('schema') : targetMeta.schema;
+                    const targetSchema = (coll[0] ?? snap?.[0]) && (0, core_1.helper)(coll[0] ?? snap?.[0]).getSchema();
+                    schema = targetMeta.schema === '*' ? options?.schema ?? targetSchema ?? this.config.get('schema') : targetMeta.schema;
                 }
             }
             else if (schema == null) {

package/package.json

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

package/query/ObjectCriteriaNode.js

@@ -58,7 +58,7 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
                 }
                 return { $and };
             }
-            alias = this.autoJoin(qb, ownerAlias);
+            alias = this.autoJoin(qb, ownerAlias, options);
         }
         return keys.reduce((o, field) => {
             const childNode = this.payload[field];
@@ -196,7 +196,7 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
         });
         return !primaryKeys && !nestedAlias && !operatorKeys && !embeddable;
     }
-    autoJoin(qb, alias) {
+    autoJoin(qb, alias, options) {
         const nestedAlias = qb.getNextAlias(this.prop?.pivotTable ?? this.entityName);
         const customExpression = core_1.RawQueryFragment.isKnownFragment(this.key);
         const scalar = core_1.Utils.isPrimaryKey(this.payload) || this.payload instanceof RegExp || this.payload instanceof Date || customExpression;
@@ -214,7 +214,9 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
                 qb._fields = prev;
             }
         }
-        qb.scheduleFilterCheck(path);
+        if (!options || options.type !== 'orderBy') {
+            qb.scheduleFilterCheck(path);
+        }
         return nestedAlias;
     }
     isPrefixed(field) {

package/query/QueryBuilder.js

@@ -250,9 +250,12 @@ class QueryBuilder {
             }
         }
         prop.targetMeta.props
-            .filter(prop => explicitFields
-            ? explicitFields.includes(prop.name) || explicitFields.includes(`${alias}.${prop.name}`) || prop.primary
-            : this.platform.shouldHaveColumn(prop, populate))
+            .filter(prop => {
+            if (!explicitFields) {
+                return this.platform.shouldHaveColumn(prop, populate);
+            }
+            return prop.primary && !explicitFields.includes(prop.name) && !explicitFields.includes(`${alias}.${prop.name}`);
+        })
             .forEach(prop => fields.push(...this.driver.mapPropToFieldNames(this, prop, alias)));
         return fields;
     }
@@ -285,6 +288,12 @@ class QueryBuilder {
             }
             const cond = await em.applyFilters(join.prop.type, join.cond, filterOptions, 'read');
             if (core_1.Utils.hasObjectKeys(cond)) {
+                // remove nested filters, we only care about scalars here, nesting would require another join branch
+                for (const key of Object.keys(cond)) {
+                    if (core_1.Utils.isPlainObject(cond[key]) && Object.keys(cond[key]).every(k => !(core_1.Utils.isOperator(k) && !['$some', '$none', '$every'].includes(k)))) {
+                        delete cond[key];
+                    }
+                }
                 if (core_1.Utils.hasObjectKeys(join.cond)) {
                     /* istanbul ignore next */
                     join.cond = { $and: [join.cond, cond] };
@@ -368,7 +377,7 @@ class QueryBuilder {
                 convertCustomTypes: false,
                 type: 'orderBy',
             });
-            this._orderBy.push(CriteriaNodeFactory_1.CriteriaNodeFactory.createNode(this.metadata, this.mainAlias.entityName, processed).process(this, { matchPopulateJoins: true }));
+            this._orderBy.push(CriteriaNodeFactory_1.CriteriaNodeFactory.createNode(this.metadata, this.mainAlias.entityName, processed).process(this, { matchPopulateJoins: true, type: 'orderBy' }));
         });
         return this;
     }
@@ -1272,9 +1281,7 @@ class QueryBuilder {
         }
     }
     hasToManyJoins() {
-        // console.log(this._joins);
         return Object.values(this._joins).some(join => {
-            // console.log(join.prop.name, join.prop.kind, [ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(join.prop.kind));
             return [core_1.ReferenceKind.ONE_TO_MANY, core_1.ReferenceKind.MANY_TO_MANY].includes(join.prop.kind);
         });
     }

package/typings.d.ts

@@ -170,6 +170,7 @@ export interface ICriteriaNodeProcessOptions {
     matchPopulateJoins?: boolean;
     ignoreBranching?: boolean;
     preferNoBranch?: boolean;
+    type?: 'orderBy';
 }
 export interface ICriteriaNode<T extends object> {
     readonly entityName: string;