typeorm 0.3.8-dev.e49d0c8 → 0.3.8

package/browser/query-builder/SelectQueryBuilder.js

@@ -565,6 +565,13 @@ export class SelectQueryBuilder extends QueryBuilder {
         this.expressionMap.lockTables = lockTables;
         return this;
     }
+    /**
+     * Sets lock handling by adding NO WAIT or SKIP LOCKED.
+     */
+    setOnLocked(onLocked) {
+        this.expressionMap.onLocked = onLocked;
+        return this;
+    }
     /**
      * Disables the global condition of "non-deleted" for the entity with delete date columns.
      */
@@ -999,7 +1006,8 @@ export class SelectQueryBuilder extends QueryBuilder {
                 select += `/*+ MAX_EXECUTION_TIME(${this.expressionMap.maxExecutionTime}) */ `;
             }
         }
-        if (driver.options.type === "postgres" && selectDistinctOn.length > 0) {
+        if (DriverUtils.isPostgresFamily(driver) &&
+            selectDistinctOn.length > 0) {
             const selectDistinctOnMap = selectDistinctOn
                 .map((on) => this.replacePropertyNames(on))
                 .join(", ");
@@ -1329,7 +1337,7 @@ export class SelectQueryBuilder extends QueryBuilder {
         const driver = this.connection.driver;
         let lockTablesClause = "";
         if (this.expressionMap.lockTables) {
-            if (!(driver.options.type === "postgres" ||
+            if (!(DriverUtils.isPostgresFamily(driver) ||
                 driver.options.type === "cockroachdb")) {
                 throw new TypeORMError("Lock tables not supported in selected driver");
             }
@@ -1338,14 +1346,29 @@ export class SelectQueryBuilder extends QueryBuilder {
             }
             lockTablesClause = " OF " + this.expressionMap.lockTables.join(", ");
         }
+        let onLockExpression = "";
+        if (this.expressionMap.onLocked === "nowait") {
+            onLockExpression = " NOWAIT";
+        }
+        else if (this.expressionMap.onLocked === "skip_locked") {
+            onLockExpression = " SKIP LOCKED";
+        }
         switch (this.expressionMap.lockMode) {
             case "pessimistic_read":
-                if (DriverUtils.isMySQLFamily(driver) ||
+                if (driver.options.type === "mysql" ||
                     driver.options.type === "aurora-mysql") {
+                    if (DriverUtils.isReleaseVersionOrGreater(driver, "8.0.0")) {
+                        return (" FOR SHARE" + lockTablesClause + onLockExpression);
+                    }
+                    else {
+                        return " LOCK IN SHARE MODE";
+                    }
+                }
+                else if (driver.options.type === "mariadb") {
                     return " LOCK IN SHARE MODE";
                 }
-                else if (driver.options.type === "postgres") {
-                    return " FOR SHARE" + lockTablesClause;
+                else if (DriverUtils.isPostgresFamily(driver)) {
+                    return " FOR SHARE" + lockTablesClause + onLockExpression;
                 }
                 else if (driver.options.type === "oracle") {
                     return " FOR UPDATE";
@@ -1360,11 +1383,11 @@ export class SelectQueryBuilder extends QueryBuilder {
                 if (DriverUtils.isMySQLFamily(driver) ||
                     driver.options.type === "aurora-mysql" ||
                     driver.options.type === "oracle") {
-                    return " FOR UPDATE";
+                    return " FOR UPDATE" + onLockExpression;
                 }
-                else if (driver.options.type === "postgres" ||
+                else if (DriverUtils.isPostgresFamily(driver) ||
                     driver.options.type === "cockroachdb") {
-                    return " FOR UPDATE" + lockTablesClause;
+                    return " FOR UPDATE" + lockTablesClause + onLockExpression;
                 }
                 else if (driver.options.type === "mssql") {
                     return "";
@@ -1373,7 +1396,7 @@ export class SelectQueryBuilder extends QueryBuilder {
                     throw new LockNotSupportedOnGivenDriverError();
                 }
             case "pessimistic_partial_write":
-                if (driver.options.type === "postgres") {
+                if (DriverUtils.isPostgresFamily(driver)) {
                     return " FOR UPDATE" + lockTablesClause + " SKIP LOCKED";
                 }
                 else if (DriverUtils.isMySQLFamily(driver)) {
@@ -1383,7 +1406,7 @@ export class SelectQueryBuilder extends QueryBuilder {
                     throw new LockNotSupportedOnGivenDriverError();
                 }
             case "pessimistic_write_or_fail":
-                if (driver.options.type === "postgres" ||
+                if (DriverUtils.isPostgresFamily(driver) ||
                     driver.options.type === "cockroachdb") {
                     return " FOR UPDATE" + lockTablesClause + " NOWAIT";
                 }
@@ -1394,16 +1417,18 @@ export class SelectQueryBuilder extends QueryBuilder {
                     throw new LockNotSupportedOnGivenDriverError();
                 }
             case "for_no_key_update":
-                if (driver.options.type === "postgres" ||
+                if (DriverUtils.isPostgresFamily(driver) ||
                     driver.options.type === "cockroachdb") {
-                    return " FOR NO KEY UPDATE" + lockTablesClause;
+                    return (" FOR NO KEY UPDATE" +
+                        lockTablesClause +
+                        onLockExpression);
                 }
                 else {
                     throw new LockNotSupportedOnGivenDriverError();
                 }
             case "for_key_share":
-                if (driver.options.type === "postgres") {
-                    return " FOR KEY SHARE" + lockTablesClause;
+                if (DriverUtils.isPostgresFamily(driver)) {
+                    return (" FOR KEY SHARE" + lockTablesClause + onLockExpression);
                 }
                 else {
                     throw new LockNotSupportedOnGivenDriverError();
@@ -1466,7 +1491,7 @@ export class SelectQueryBuilder extends QueryBuilder {
                     const asText = useLegacy ? "AsText" : "ST_AsText";
                     selectionPath = `${asText}(${selectionPath})`;
                 }
-                if (this.connection.driver.options.type === "postgres")
+                if (DriverUtils.isPostgresFamily(this.connection.driver))
                     if (column.precision) {
                         // cast to JSON to trigger parsing in the driver
                         selectionPath = `ST_AsGeoJSON(${selectionPath}, ${column.precision})::json`;
@@ -1523,7 +1548,7 @@ export class SelectQueryBuilder extends QueryBuilder {
         }
         // For everything else, we'll need to do some hackery to get the correct count values.
         if (this.connection.driver.options.type === "cockroachdb" ||
-            this.connection.driver.options.type === "postgres") {
+            DriverUtils.isPostgresFamily(this.connection.driver)) {
             // Postgres and CockroachDB can pass multiple parameters to the `DISTINCT` function
             // https://www.postgresql.org/docs/9.5/sql-select.html#SQL-DISTINCT
             return ("COUNT(DISTINCT(" +
@@ -1751,6 +1776,9 @@ export class SelectQueryBuilder extends QueryBuilder {
                         })
                         : undefined;
                     this.setLock(this.findOptions.lock.mode, undefined, tableNames);
+                    if (this.findOptions.lock.onLocked) {
+                        this.setOnLocked(this.findOptions.lock.onLocked);
+                    }
                 }
             }
             if (this.findOptions.loadRelationIds === true) {
@@ -2227,9 +2255,9 @@ export class SelectQueryBuilder extends QueryBuilder {
                     ? order[key].nulls
                     : undefined;
                 nulls =
-                    nulls === "first"
+                    (nulls === null || nulls === void 0 ? void 0 : nulls.toLowerCase()) === "first"
                         ? "NULLS FIRST"
-                        : nulls === "last"
+                        : (nulls === null || nulls === void 0 ? void 0 : nulls.toLowerCase()) === "last"
                             ? "NULLS LAST"
                             : undefined;
                 this.addOrderBy(`${alias}.${propertyPath}`, direction, nulls);
@@ -2397,6 +2425,17 @@ export class SelectQueryBuilder extends QueryBuilder {
                                 " " +
                                 parseInt(where[key].value));
                         }
+                        else {
+                            if (relation.isManyToOne ||
+                                (relation.isOneToOne &&
+                                    relation.isOneToOneOwner)) {
+                                const aliasPath = `${alias}.${propertyPath}`;
+                                andConditions.push(this.createWhereConditionExpression(this.getWherePredicateCondition(aliasPath, where[key])));
+                            }
+                            else {
+                                throw new Error(`This relation isn't supported by given find operator`);
+                            }
+                        }
                     }
                     else {
                         // const joinAlias = alias + "_" + relation.propertyName;