From 6bd2aea629087b31281f9a132189d1a5191162ab Mon Sep 17 00:00:00 2001
From: clarkdave <me@clarkdave.net>
Date: Fri, 23 Nov 2018 15:49:16 +0000
Subject: [PATCH] deprecate setLock in favour of lockMode

https://github.com/typeorm/typeorm/issues/2037
---
 src/query-builder/SelectQueryBuilder.ts | 31 ++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/query-builder/SelectQueryBuilder.ts b/src/query-builder/SelectQueryBuilder.ts
index 50f7592183..4b8a8d71b2 100644
--- a/src/query-builder/SelectQueryBuilder.ts
+++ b/src/query-builder/SelectQueryBuilder.ts
@@ -959,27 +959,56 @@ export class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> implements
 
     /**
      * Sets locking mode.
+     * 
+     * @deprecated Use `lockMode`
      */
     setLock(lockMode: "optimistic", lockVersion: number): this;
 
     /**
      * Sets locking mode.
+     * 
+     * @deprecated Use `lockMode`
      */
     setLock(lockMode: "optimistic", lockVersion: Date): this;
 
     /**
      * Sets locking mode.
+     * 
+     * @deprecated Use `lockMode`
      */
     setLock(lockMode: "pessimistic_read"|"pessimistic_write"|"dirty_read"|"pessimistic_partial_write"|"pessimistic_write_or_fail"|"for_no_key_update"): this;
 
     /**
      * Sets locking mode.
+     * 
+     * @deprecated Use `lockMode`
      */
     setLock(lockMode: "optimistic"|"pessimistic_read"|"pessimistic_write"|"dirty_read"|"pessimistic_partial_write"|"pessimistic_write_or_fail"|"for_no_key_update", lockVersion?: number|Date): this {
+        return this.lockMode(lockMode as any, lockVersion as any);
+    }
+
+    /**
+     * Sets locking mode.
+     */
+    lockMode(lockMode: "optimistic", lockVersion: number): this;
+
+    /**
+     * Sets locking mode.
+     */
+    lockMode(lockMode: "optimistic", lockVersion: Date): this;
+
+    /**
+     * Sets locking mode.
+     */
+    lockMode(lockMode: "pessimistic_read"|"pessimistic_write"|"dirty_read"): this;
+
+    /**
+     * Sets locking mode.
+     */
+    lockMode(lockMode: "optimistic"|"pessimistic_read"|"pessimistic_write"|"dirty_read"|"pessimistic_partial_write"|"pessimistic_write_or_fail"|"for_no_key_update", lockVersion?: number|Date): this {
         this.expressionMap.lockMode = lockMode;
         this.expressionMap.lockVersion = lockVersion;
         return this;
-
     }
 
     /**