@mikro-orm/knex 6.0.0-dev.17 → 6.0.0-dev.19

package/SqlEntityManager.js

@@ -35,7 +35,7 @@ class SqlEntityManager extends core_1.EntityManager {
         return this.getConnection(type).getKnex();
     }
     async execute(queryOrKnex, params = [], method = 'all') {
-        return this.getDriver().execute(queryOrKnex, params, method, this.getTransactionContext());
+        return this.getDriver().execute(queryOrKnex, params, method, this.getContext(false).getTransactionContext());
     }
     getRepository(entityName) {
         return super.getRepository(entityName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.17",
+  "version": "6.0.0-dev.19",
   "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",
@@ -63,9 +63,9 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^5.6.2"
+    "@mikro-orm/core": "^5.6.3"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.17"
+    "@mikro-orm/core": "~6.0.0-dev.19"
   }
 }

package/query/QueryBuilder.d.ts

@@ -181,6 +181,10 @@ export declare class QueryBuilder<T extends object = AnyEntity> {
      * Executes count query (without offset and limit), returning total count of results
      */
     getCount(field?: string | string[], distinct?: boolean): Promise<number>;
+    /**
+     * Executes the query, returning both array of results and total count query (without offset and limit).
+     */
+    getResultAndCount(): Promise<[T[], number]>;
     /**
      * Provides promise-like interface so we can await the QB instance.
      */

package/query/QueryBuilder.js

@@ -489,6 +489,15 @@ class QueryBuilder {
         }
         return res ? +res.count : 0;
     }
+    /**
+     * Executes the query, returning both array of results and total count query (without offset and limit).
+     */
+    async getResultAndCount() {
+        return Promise.all([
+            this.getResultList(),
+            this.getCount(),
+        ]);
+    }
     /**
      * Provides promise-like interface so we can await the QB instance.
      */