add lock method to SelectQueryBuilder

typeorm#2037
loyaltylion · Nov 19, 2019 · fba8743 · fba8743
1 parent d2c9b03
commit fba8743
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/query-builder/QueryExpressionMap.ts b/src/query-builder/QueryExpressionMap.ts
@@ -152,6 +152,12 @@ export class QueryExpressionMap {
      */
     lockVersion?: number|Date;
 
+    /**
+     * Locking clause.
+     * 
+     */
+    lockClause?: string;
+
     /**
      * Parameters used to be escaped in final query.
      */

diff --git a/src/query-builder/SelectQueryBuilder.ts b/src/query-builder/SelectQueryBuilder.ts
@@ -999,6 +999,16 @@ export class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> implements
         return this;
     }
 
+    /**
+     * Set a lock clause, passed directly into the query.
+     * e.g. `FOR UPDATE NOWAIT`.
+     * If set, will override `lockMode`.
+     */
+    lock(clause: string): this {
+        this.expressionMap.lockClause = clause;
+        return this;
+    }
+
     /**
      * Gets first raw result returned by execution of generated query builder sql.
      */
@@ -1634,6 +1644,11 @@ export class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> implements
      */
     protected createLockExpression(): string {
         const driver = this.connection.driver;
+
+        if (this.expressionMap.lockClause) {
+            return ` ${this.expressionMap.lockClause}`;
+        }
+
         switch (this.expressionMap.lockMode) {
             case "pessimistic_read":
                 if (driver instanceof MysqlDriver || driver instanceof AuroraDataApiDriver) {