feat: lock modes in cockroachdb (#8250)

closes #8249
typeorm · Nov 18, 2021 · d494fcc · d494fcc
1 parent 4e7d32f
commit d494fcc
Show file tree

Hide file tree

Showing 4 changed files with 193 additions and 108 deletions.
diff --git a/docs/find-options.md b/docs/find-options.md
@@ -239,6 +239,7 @@ Support of lock modes, and SQL statements they translate to, are listed in the t
 | Oracle          | FOR UPDATE               | FOR UPDATE              | (nothing)     |                             |                             |                     |
 | SQL Server      | WITH (HOLDLOCK, ROWLOCK) | WITH (UPDLOCK, ROWLOCK) | WITH (NOLOCK) |                             |                             |                     |
 | AuroraDataApi   | LOCK IN SHARE MODE       | FOR UPDATE              | (nothing)     |                             |                             |                     |
+| CockroachDB     |                          | FOR UPDATE              | (nothing)     |                             | FOR UPDATE NOWAIT           | FOR NO KEY UPDATE   |
 
 ```
 

diff --git a/src/query-builder/SelectQueryBuilder.ts b/src/query-builder/SelectQueryBuilder.ts
@@ -1702,7 +1702,7 @@ export class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> implements
         let lockTablesClause = "";
 
         if (this.expressionMap.lockTables) {
-            if (!(driver instanceof PostgresDriver)) {
+            if (!(driver instanceof PostgresDriver || driver instanceof CockroachDriver)) {
                 throw new TypeORMError("Lock tables not supported in selected driver");
             }
             if (this.expressionMap.lockTables.length < 1) {
@@ -1733,7 +1733,7 @@ export class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> implements
                     return " FOR UPDATE";
 
                 }
-                else if (driver instanceof PostgresDriver ) {
+                else if (driver instanceof PostgresDriver || driver instanceof CockroachDriver) {
                     return " FOR UPDATE" + lockTablesClause;
 
                 } else if (driver instanceof SqlServerDriver) {
@@ -1753,7 +1753,7 @@ export class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> implements
                     throw new LockNotSupportedOnGivenDriverError();
                 }
             case "pessimistic_write_or_fail":
-                if (driver instanceof PostgresDriver) {
+                if (driver instanceof PostgresDriver || driver instanceof CockroachDriver) {
                     return " FOR UPDATE" + lockTablesClause + " NOWAIT";
 
                 } else if (driver instanceof MysqlDriver) {
@@ -1764,7 +1764,7 @@ export class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> implements
                 }
 
             case "for_no_key_update":
-                if (driver instanceof PostgresDriver) {
+                if (driver instanceof PostgresDriver || driver instanceof CockroachDriver) {
                     return " FOR NO KEY UPDATE" + lockTablesClause;
                 } else {
                     throw new LockNotSupportedOnGivenDriverError();