@mikro-orm/knex 6.0.0-dev.30 → 6.0.0-dev.32

package/package.json

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

package/query/QueryBuilder.js

@@ -361,7 +361,8 @@ class QueryBuilder {
         core_1.Utils.runIfNotEmpty(() => {
             const queryOrder = this.helper.getQueryOrder(this.type ?? enums_1.QueryType.SELECT, this._orderBy, this._populateMap);
             if (queryOrder) {
-                return qb.orderByRaw(queryOrder);
+                qb.orderByRaw(queryOrder);
+                return;
             }
         }, this._orderBy);
         core_1.Utils.runIfNotEmpty(() => qb.limit(this._limit), this._limit != null);
@@ -610,11 +611,13 @@ class QueryBuilder {
         const ret = [];
         fields.forEach(field => {
             if (!core_1.Utils.isString(field)) {
-                return ret.push(field);
+                ret.push(field);
+                return;
             }
             const join = Object.keys(this._joins).find(k => field === k.substring(0, k.indexOf('#')));
             if (join && type === 'where') {
-                return ret.push(...this.helper.mapJoinColumns(this.type ?? enums_1.QueryType.SELECT, this._joins[join]));
+                ret.push(...this.helper.mapJoinColumns(this.type ?? enums_1.QueryType.SELECT, this._joins[join]));
+                return;
             }
             const [a, f] = this.helper.splitField(field);
             const prop = this.helper.getProperty(f, a);
@@ -753,7 +756,8 @@ class QueryBuilder {
             const aliasedField = `${fromAlias}.${fromField}`;
             const join = Object.keys(this._joins).find(k => `${aliasedField}#${this._joins[k].alias}` === k);
             if (join && this._joins[join] && this.helper.isOneToOneInverse(fromField)) {
-                return this._populateMap[join] = this._joins[join].alias;
+                this._populateMap[join] = this._joins[join].alias;
+                return;
             }
             if (this.metadata.find(field)?.pivotTable) { // pivot table entity
                 this.autoJoinPivotTable(field);

package/schema/SqlSchemaGenerator.d.ts

@@ -83,7 +83,7 @@ export declare class SqlSchemaGenerator extends AbstractSchemaGenerator<Abstract
     dropDatabase(name: string): Promise<void>;
     execute(sql: string, options?: {
         wrap?: boolean;
-    }): Promise<undefined>;
+    }): Promise<void>;
     private wrapSchema;
     private createSchemaBuilder;
     private createTable;

package/schema/SqlSchemaGenerator.js

@@ -360,7 +360,8 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         }
         if (this.platform.supportsMultipleStatements()) {
             const query = lines.join('\n');
-            return void await this.driver.execute(query);
+            await this.driver.execute(query);
+            return;
         }
         await core_1.Utils.runSerial(lines, line => this.driver.execute(line));
     }