@mikro-orm/knex 6.0.0-dev.87 → 6.0.0-dev.89

package/AbstractSqlDriver.js

@@ -547,12 +547,13 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         if (owners.length === 1 && (options?.offset != null || options?.limit != null)) {
             qb.limit(options.limit, options.offset);
         }
+        const schema = this.config.get('schema');
         if (prop.targetMeta.schema !== '*' && pivotMeta.schema === '*' && options?.schema) {
             // eslint-disable-next-line dot-notation
             qb['finalize']();
             // eslint-disable-next-line dot-notation
             Object.values(qb['_joins']).forEach(join => {
-                join.schema = options.schema;
+                join.schema = schema;
             });
         }
         const items = owners.length ? await this.rethrow(qb.execute('all')) : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.87",
+  "version": "6.0.0-dev.89",
   "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,6 +66,6 @@
     "@mikro-orm/core": "^5.7.12"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.87"
+    "@mikro-orm/core": "~6.0.0-dev.89"
   }
 }

package/query/QueryBuilder.js

@@ -529,7 +529,7 @@ class QueryBuilder {
             res = await this.execute('get', false);
         }
         else {
-            const qb = this.clone();
+            const qb = this.type === undefined ? this : this.clone();
             qb.count(field, distinct ?? qb.hasToManyJoins()).limit(undefined).offset(undefined).orderBy([]);
             res = await qb.execute('get', false);
         }