@mikro-orm/knex 6.3.7-dev.4 → 6.3.7-dev.6

package/AbstractSqlDriver.js

@@ -135,6 +135,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             .indexHint(options.indexHint)
             .comment(options.comments)
             .hintComment(options.hintComments);
+        qb.where(where);
         const { first, last, before, after } = options;
         const isCursorPagination = [first, last, before, after].some(v => v != null);
         if (type !== query_1.QueryType.COUNT) {
@@ -149,7 +150,6 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             }
             qb.limit(options?.limit, options?.offset);
         }
-        qb.where(where);
         const kqb = qb.getKnexQuery(false).clear('select');
         if (type === query_1.QueryType.COUNT) {
             kqb.select(this.connection.getKnex().raw('count(*) as count'));

package/package.json

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

package/query/QueryBuilderHelper.js

@@ -223,22 +223,13 @@ class QueryBuilderHelper {
             const alias = join.inverseAlias ?? join.alias;
             join.cond[`${alias}.${typeProperty}`] = join.prop.targetMeta.discriminatorValue;
         }
-        for (const key of Object.keys(join.cond)) {
-            const hasPrefix = key.includes('.') || core_1.Utils.isOperator(key) || core_1.RawQueryFragment.isKnownFragment(key);
-            const newKey = hasPrefix ? key : `${join.alias}.${key}`;
-            const clause = this.processJoinClause(newKey, join.cond[key], join.alias, params);
-            /* istanbul ignore else */
-            if (clause !== '()') {
-                conditions.push(clause);
-            }
-        }
         let sql = method + ' ';
         if (join.nested) {
             sql += `(${this.knex.ref(table)} as ${this.knex.ref(join.alias)}`;
             for (const nested of join.nested) {
                 const { sql: nestedSql, params: nestedParams } = this.createJoinExpression(nested, joins, schema);
                 sql += ' ' + nestedSql;
-                params.unshift(...nestedParams);
+                params.push(...nestedParams);
             }
             sql += `)`;
         }
@@ -248,6 +239,15 @@ class QueryBuilderHelper {
         else {
             sql += `${this.knex.ref(table)} as ${this.knex.ref(join.alias)}`;
         }
+        for (const key of Object.keys(join.cond)) {
+            const hasPrefix = key.includes('.') || core_1.Utils.isOperator(key) || core_1.RawQueryFragment.isKnownFragment(key);
+            const newKey = hasPrefix ? key : `${join.alias}.${key}`;
+            const clause = this.processJoinClause(newKey, join.cond[key], join.alias, params);
+            /* istanbul ignore else */
+            if (clause !== '()') {
+                conditions.push(clause);
+            }
+        }
         if (conditions.length > 0) {
             sql += ` on ${conditions.join(' and ')}`;
         }
@@ -321,7 +321,7 @@ class QueryBuilderHelper {
     }
     mapJoinColumns(type, join) {
         if (join.prop && [core_1.ReferenceKind.MANY_TO_ONE, core_1.ReferenceKind.ONE_TO_ONE].includes(join.prop.kind)) {
-            return join.prop.fieldNames.map((fieldName, idx) => {
+            return join.prop.fieldNames.map((_fieldName, idx) => {
                 const columns = join.prop.owner ? join.joinColumns : join.inverseJoinColumns;
                 return this.mapper(`${join.alias}.${columns[idx]}`, type, undefined, `${join.alias}__${columns[idx]}`);
             });