@mikro-orm/knex 6.0.0-dev.71 → 6.0.0-dev.73

package/AbstractSqlDriver.js

@@ -795,6 +795,10 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             }
             return;
         }
+        if (prop.formula) {
+            ret.push(prop.name);
+            return;
+        }
         if (prop.fieldNames) {
             ret.push(...prop.fieldNames);
         }

package/index.mjs

@@ -12,6 +12,7 @@ export const AbstractSqlPlatform = mod.AbstractSqlPlatform;
 export const AfterCreate = mod.AfterCreate;
 export const AfterDelete = mod.AfterDelete;
 export const AfterUpdate = mod.AfterUpdate;
+export const AfterUpsert = mod.AfterUpsert;
 export const ArrayCollection = mod.ArrayCollection;
 export const ArrayCriteriaNode = mod.ArrayCriteriaNode;
 export const ArrayType = mod.ArrayType;
@@ -19,6 +20,7 @@ export const BaseEntity = mod.BaseEntity;
 export const BeforeCreate = mod.BeforeCreate;
 export const BeforeDelete = mod.BeforeDelete;
 export const BeforeUpdate = mod.BeforeUpdate;
+export const BeforeUpsert = mod.BeforeUpsert;
 export const BigIntType = mod.BigIntType;
 export const BlobType = mod.BlobType;
 export const BooleanType = mod.BooleanType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.71",
+  "version": "6.0.0-dev.73",
   "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.7.2"
+    "@mikro-orm/core": "^5.7.6"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.71"
+    "@mikro-orm/core": "~6.0.0-dev.73"
   }
 }

package/query/QueryBuilder.js

@@ -616,11 +616,15 @@ class QueryBuilder {
     joinReference(field, alias, cond, type, path) {
         this.ensureNotFinalized();
         const [fromAlias, fromField] = this.helper.splitField(field);
-        const entityName = this._aliases[fromAlias]?.entityName;
+        const q = (str) => `'${str}'`;
+        if (!this._aliases[fromAlias]) {
+            throw new Error(`Trying to join ${q(fromField)} with alias ${q(fromAlias)}, but ${q(fromAlias)} is not a known alias. Available aliases are: ${Object.keys(this._aliases).map(q).join(', ')}.`);
+        }
+        const entityName = this._aliases[fromAlias].entityName;
         const meta = this.metadata.get(entityName);
         const prop = meta.properties[fromField];
         if (!prop) {
-            throw new Error(`Trying to join ${field}, but ${fromField} is not a defined relation on ${meta.className}`);
+            throw new Error(`Trying to join ${q(field)}, but ${q(fromField)} is not a defined relation on ${meta.className}.`);
         }
         this.createAlias(prop.type, alias);
         cond = core_1.QueryHelper.processWhere({
@@ -865,8 +869,8 @@ class QueryBuilder {
         core_1.QueryHelper.processObjectParams(this._data);
         core_1.QueryHelper.processObjectParams(this._cond);
         core_1.QueryHelper.processObjectParams(this._having);
-        // automatically enable paginate flag when we detect to-many joins
-        if (!this.flags.has(core_1.QueryFlag.DISABLE_PAGINATE) && this.hasToManyJoins()) {
+        // automatically enable paginate flag when we detect to-many joins, but only if there is no `group by` clause
+        if (!this.flags.has(core_1.QueryFlag.DISABLE_PAGINATE) && this._groupBy.length === 0 && this.hasToManyJoins()) {
             this.flags.add(core_1.QueryFlag.PAGINATE);
         }
         if (meta && this.flags.has(core_1.QueryFlag.PAGINATE) && (this._limit > 0 || this._offset > 0)) {