From dc2f306a5cad26a72ba8c589f731e318ce68f636 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 | 33 +++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/query-builder/SelectQueryBuilder.ts b/src/query-builder/SelectQueryBuilder.ts
index 602396bf20..2a9ec07ff7 100644
--- a/src/query-builder/SelectQueryBuilder.ts
+++ b/src/query-builder/SelectQueryBuilder.ts
@@ -938,27 +938,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"): this;
 
     /**
      * Sets locking mode.
+     * 
+     * @deprecated Use `lockMode`
      */
-    setLock(lockMode: "optimistic"|"pessimistic_read"|"pessimistic_write", lockVersion?: number|Date): this {
+    setLock(lockMode: any, lockVersion?: any): this {
+        return this.lockMode(lockMode, lockVersion);
+    }
+
+    /**
+     * 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"): this;
+
+    /**
+     * Sets locking mode.
+     */
+    lockMode(lockMode: "optimistic"|"pessimistic_read"|"pessimistic_write", lockVersion?: number|Date): this {
         this.expressionMap.lockMode = lockMode;
         this.expressionMap.lockVersion = lockVersion;
         return this;
-
     }
 
     /**