@mikro-orm/knex 5.8.11-dev.14 → 5.8.11-dev.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "5.8.11-dev.14",
+  "version": "5.8.11-dev.16",
   "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,9 +66,9 @@
     "@mikro-orm/core": "^5.8.10"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "5.8.11-dev.14",
-    "@mikro-orm/entity-generator": "5.8.11-dev.14",
-    "@mikro-orm/migrations": "5.8.11-dev.14",
+    "@mikro-orm/core": "5.8.11-dev.16",
+    "@mikro-orm/entity-generator": "5.8.11-dev.16",
+    "@mikro-orm/migrations": "5.8.11-dev.16",
     "better-sqlite3": "*",
     "mssql": "*",
     "mysql": "*",

package/query/QueryBuilder.js

@@ -782,6 +782,8 @@ class QueryBuilder {
     getQueryBase() {
         const qb = this.getKnex();
         const schema = this.getSchema(this.mainAlias);
+        // Joined tables doesn't need to belong to the same schema as the main table
+        const joinSchema = this._schema ?? this.em?.schema ?? schema;
         if (schema) {
             qb.withSchema(schema);
         }
@@ -800,12 +802,12 @@ class QueryBuilder {
                 else if (this.flags.has(core_1.QueryFlag.DISTINCT)) {
                     qb.distinct();
                 }
-                this.helper.processJoins(qb, this._joins, schema);
+                this.helper.processJoins(qb, this._joins, joinSchema);
                 break;
             case enums_1.QueryType.COUNT: {
                 const m = this.flags.has(core_1.QueryFlag.DISTINCT) ? 'countDistinct' : 'count';
                 qb[m]({ count: this._fields.map(f => this.helper.mapper(f, this.type)) });
-                this.helper.processJoins(qb, this._joins, schema);
+                this.helper.processJoins(qb, this._joins, joinSchema);
                 break;
             }
             case enums_1.QueryType.INSERT:
@@ -998,7 +1000,7 @@ class QueryBuilder {
     getSchema(alias) {
         const { metadata } = alias;
         const metaSchema = metadata?.schema && metadata.schema !== '*' ? metadata.schema : undefined;
-        return this._schema ?? metaSchema ?? this.em?.config.get('schema');
+        return this._schema ?? metaSchema ?? this.em?.schema ?? this.em?.config.get('schema');
     }
     createAlias(entityName, aliasName, subQuery) {
         const metadata = this.metadata.find(entityName);

package/query/QueryBuilderHelper.js

@@ -133,7 +133,7 @@ class QueryBuilderHelper {
         return {
             prop, type, cond, ownerAlias, alias,
             table: this.getTableName(prop.type),
-            schema: this.driver.getSchemaName(prop.targetMeta),
+            schema: prop.targetMeta?.schema === '*' ? '*' : this.driver.getSchemaName(prop.targetMeta),
             joinColumns: prop.referencedColumnNames,
             primaryKeys: prop.fieldNames,
         };
@@ -150,7 +150,7 @@ class QueryBuilderHelper {
                 primaryKeys: prop.referencedColumnNames,
                 cond: {},
                 table: pivotMeta.tableName,
-                schema: this.driver.getSchemaName(pivotMeta),
+                schema: prop.targetMeta?.schema === '*' ? '*' : this.driver.getSchemaName(pivotMeta),
                 path: path.endsWith('[pivot]') ? path : `${path}[pivot]`,
             },
         };