@mikro-orm/knex 6.3.14-dev.41 → 6.3.14-dev.43

package/package.json

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

package/query/QueryBuilder.d.ts

@@ -156,7 +156,9 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
     orWhere(cond: string, params?: any[]): this;
     orderBy(orderBy: QBQueryOrderMap<Entity> | QBQueryOrderMap<Entity>[]): SelectQueryBuilder<Entity, RootAlias, Hint, Context>;
     groupBy(fields: EntityKeyOrString<Entity> | readonly EntityKeyOrString<Entity>[]): SelectQueryBuilder<Entity, RootAlias, Hint, Context>;
-    having(cond?: QBFilterQuery | string, params?: any[]): SelectQueryBuilder<Entity, RootAlias, Hint, Context>;
+    having(cond?: QBFilterQuery | string, params?: any[], operator?: keyof typeof GroupOperator): SelectQueryBuilder<Entity, RootAlias, Hint, Context>;
+    andHaving(cond?: QBFilterQuery | string, params?: any[]): SelectQueryBuilder<Entity, RootAlias, Hint, Context>;
+    orHaving(cond?: QBFilterQuery | string, params?: any[]): SelectQueryBuilder<Entity, RootAlias, Hint, Context>;
     onConflict(fields?: Field<Entity> | Field<Entity>[]): InsertQueryBuilder<Entity>;
     ignore(): this;
     merge(data?: EntityData<Entity> | Field<Entity>[]): this;

package/query/QueryBuilder.js

@@ -348,14 +348,27 @@ class QueryBuilder {
         this._groupBy = core_1.Utils.asArray(fields);
         return this;
     }
-    having(cond = {}, params) {
+    having(cond = {}, params, operator) {
         this.ensureNotFinalized();
         if (core_1.Utils.isString(cond)) {
             cond = { [(0, core_1.raw)(`(${cond})`, params)]: [] };
         }
-        this._having = CriteriaNodeFactory_1.CriteriaNodeFactory.createNode(this.metadata, this.mainAlias.entityName, cond).process(this);
+        cond = CriteriaNodeFactory_1.CriteriaNodeFactory.createNode(this.metadata, this.mainAlias.entityName, cond).process(this);
+        if (!this._having || !operator) {
+            this._having = cond;
+        }
+        else {
+            const cond1 = [this._having, cond];
+            this._having = { [operator]: cond1 };
+        }
         return this;
     }
+    andHaving(cond, params) {
+        return this.having(cond, params, '$and');
+    }
+    orHaving(cond, params) {
+        return this.having(cond, params, '$or');
+    }
     onConflict(fields = []) {
         const meta = this.mainAlias.metadata;
         this.ensureNotFinalized();