@mikro-orm/knex 6.5.10-dev.0 → 6.5.10-dev.10

package/dialects/postgresql/PostgreSqlTableCompiler.js

@@ -21,7 +21,7 @@ class PostgreSqlTableCompiler extends pg_tablecompiler_1.default {
         }
     }
     addColumn(col) {
-        const options = this.ormConfig.get('schemaGenerator');
+        const options = this.ormConfig?.get('schemaGenerator') ?? {};
         const quotedTableName = this.tableName();
         const type = col.getColumnType();
         const colName = this.client.wrapIdentifier(col.getColumnName(), col.columnBuilder.queryContext());

package/package.json

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

package/query/QueryBuilder.js

@@ -572,7 +572,7 @@ class QueryBuilder {
             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.getLockSQL(qb, this.lockMode, this.lockTables, this._joins);
         }
         this.helper.finalize(type, qb, this.mainAlias.metadata, this._data, this._returning);
         this.clearRawFragmentsCache();

package/query/QueryBuilderHelper.d.ts

@@ -51,7 +51,7 @@ export declare class QueryBuilderHelper {
     getQueryOrderFromObject(type: QueryType, orderBy: FlatQueryOrderMap, populate: Dictionary<string>): string[];
     finalize(type: QueryType, qb: Knex.QueryBuilder, meta?: EntityMetadata, data?: Dictionary, returning?: Field<any>[]): void;
     splitField<T>(field: EntityKey<T>, greedyAlias?: boolean): [string, EntityKey<T>, string | undefined];
-    getLockSQL(qb: Knex.QueryBuilder, lockMode: LockMode, lockTables?: string[]): void;
+    getLockSQL(qb: Knex.QueryBuilder, lockMode: LockMode, lockTables?: string[], joinsMap?: Dictionary<JoinOptions>): void;
     updateVersionProperty(qb: Knex.QueryBuilder, data: Dictionary): void;
     private prefix;
     private appendGroupCondition;

package/query/QueryBuilderHelper.js

@@ -629,11 +629,18 @@ class QueryBuilderHelper {
         const fromField = parts.join('.');
         return [fromAlias, fromField, ref];
     }
-    getLockSQL(qb, lockMode, lockTables = []) {
+    getLockSQL(qb, lockMode, lockTables = [], joinsMap) {
         const meta = this.metadata.find(this.entityName);
         if (lockMode === core_1.LockMode.OPTIMISTIC && meta && !meta.versionProperty) {
             throw core_1.OptimisticLockError.lockFailed(this.entityName);
         }
+        if (lockMode !== core_1.LockMode.OPTIMISTIC && lockTables.length === 0 && joinsMap) {
+            const joins = Object.values(joinsMap);
+            const innerJoins = joins.filter(join => [enums_1.JoinType.innerJoin, enums_1.JoinType.innerJoinLateral, enums_1.JoinType.nestedInnerJoin].includes(join.type));
+            if (joins.length > innerJoins.length) {
+                lockTables.push(this.alias, ...innerJoins.map(join => join.alias));
+            }
+        }
         switch (lockMode) {
             case core_1.LockMode.PESSIMISTIC_READ: return void qb.forShare(...lockTables);
             case core_1.LockMode.PESSIMISTIC_WRITE: return void qb.forUpdate(...lockTables);