@mikro-orm/knex 6.2.10-dev.43 → 6.2.10-dev.45

package/package.json

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

package/query/QueryBuilderHelper.js

@@ -67,7 +67,8 @@ class QueryBuilderHelper {
         }
         const rawField = core_1.RawQueryFragment.getKnownFragment(field);
         if (rawField) {
-            return this.knex.raw(rawField.sql, rawField.params);
+            // sometimes knex is confusing the binding positions, we need to interpolate early
+            return this.knex.raw(this.platform.formatQuery(rawField.sql, rawField.params));
         }
         const [a, f] = this.splitField(field);
         const prop = this.getProperty(f, a);
@@ -194,7 +195,8 @@ class QueryBuilderHelper {
                 join.primaryKeys.forEach((primaryKey, idx) => {
                     const right = `${join.alias}.${join.joinColumns[idx]}`;
                     if (join.prop.formula) {
-                        const left = join.prop.formula(join.ownerAlias);
+                        const alias = this.platform.quoteIdentifier(join.ownerAlias);
+                        const left = join.prop.formula(alias);
                         conditions.push(`${left} = ${this.knex.ref(right)}`);
                         return;
                     }