@mikro-orm/knex 6.0.5-dev.3 → 6.0.5-dev.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.5-dev.3",
+  "version": "6.0.5-dev.5",
   "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": "^6.0.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.0.5-dev.3"
+    "@mikro-orm/core": "6.0.5-dev.5"
   }
 }

package/query/QueryBuilder.js

@@ -459,6 +459,10 @@ class QueryBuilder {
         return this;
     }
     getKnexQuery(processVirtualEntity = true) {
+        if (this.#query) {
+            return this.#query.qb;
+        }
+        this.#query = {};
         this.finalize();
         const qb = this.getQueryBase(processVirtualEntity);
         const type = this.type ?? enums_1.QueryType.SELECT;
@@ -480,14 +484,14 @@ class QueryBuilder {
         core_1.Utils.runIfNotEmpty(() => this._hintComments.forEach(comment => qb.hintComment(comment)), this._hintComments);
         core_1.Utils.runIfNotEmpty(() => this.helper.appendOnConflictClause(type, this._onConflict, qb), this._onConflict);
         if (this.type === enums_1.QueryType.TRUNCATE && this.platform.usesCascadeStatement()) {
-            return this.knex.raw(qb.toSQL().toNative().sql + ' cascade');
+            return this.#query.qb = this.knex.raw(qb.toSQL().toNative().sql + ' cascade');
         }
         if (this.lockMode) {
             this.helper.getLockSQL(qb, this.lockMode, this.lockTables);
         }
         this.helper.finalize(type, qb, this.mainAlias.metadata, this._data, this._returning);
         this.clearRawFragmentsCache();
-        return qb;
+        return this.#query.qb = qb;
     }
     /**
      * @internal
@@ -504,12 +508,15 @@ class QueryBuilder {
     }
     #query;
     toQuery() {
-        if (this.#query) {
-            return this.#query;
+        if (this.#query?.sql) {
+            return { sql: this.#query.sql, _sql: this.#query._sql, params: this.#query.params };
         }
         const sql = this.getKnexQuery().toSQL();
         const query = sql.toNative();
-        return this.#query = { sql: query.sql, params: query.bindings ?? [], _sql: sql };
+        this.#query.sql = query.sql;
+        this.#query._sql = sql;
+        this.#query.params = query.bindings ?? [];
+        return { sql: this.#query.sql, _sql: this.#query._sql, params: this.#query.params };
     }
     /**
      * Returns the list of all parameters for this query.
@@ -521,7 +528,7 @@ class QueryBuilder {
      * Returns raw interpolated query string with all the parameters inlined.
      */
     getFormattedQuery() {
-        const query = this.toQuery()._sql;
+        const query = this.getKnexQuery().toSQL();
         return this.platform.formatQuery(query.sql, query.bindings);
     }
     /**