typeorm 0.2.42-dev.a855b90 → 0.2.42-dev.baa5880

package/browser/query-builder/SelectQueryBuilder.js

@@ -1026,20 +1026,6 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
         // if still selection is empty, then simply set it to all (*)
         if (allSelects.length === 0)
             allSelects.push({ selection: "*" });
-        var lock = "";
-        if (this.connection.driver instanceof SqlServerDriver) {
-            switch (this.expressionMap.lockMode) {
-                case "pessimistic_read":
-                    lock = " WITH (HOLDLOCK, ROWLOCK)";
-                    break;
-                case "pessimistic_write":
-                    lock = " WITH (UPDLOCK, ROWLOCK)";
-                    break;
-                case "dirty_read":
-                    lock = " WITH (NOLOCK)";
-                    break;
-            }
-        }
         // Use certain index
         var useIndex = "";
         if (this.expressionMap.useIndex) {
@@ -1057,7 +1043,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
         });
         var select = this.createSelectDistinctExpression();
         var selection = allSelects.map(function (select) { return select.selection + (select.aliasName ? " AS " + _this.escape(select.aliasName) : ""); }).join(", ");
-        return select + selection + " FROM " + froms.join(", ") + lock + useIndex;
+        return select + selection + " FROM " + froms.join(", ") + this.createTableLockExpression() + useIndex;
     };
     /**
      * Creates select | select distinct part of SQL query.
@@ -1103,7 +1089,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
             // table to join, without junction table involved. This means we simply join direct table.
             if (!parentAlias || !relation) {
                 var destinationJoin = joinAttr.alias.subQuery ? joinAttr.alias.subQuery : _this.getTableName(destinationTableName);
-                return " " + joinAttr.direction + " JOIN " + destinationJoin + " " + _this.escape(destinationTableAlias) +
+                return " " + joinAttr.direction + " JOIN " + destinationJoin + " " + _this.escape(destinationTableAlias) + _this.createTableLockExpression() +
                     (joinAttr.condition ? " ON " + _this.replacePropertyNames(joinAttr.condition) : "");
             }
             // if real entity relation is involved
@@ -1113,7 +1099,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
                     return destinationTableAlias + "." + joinColumn.referencedColumn.propertyPath + "=" +
                         parentAlias + "." + relation.propertyPath + "." + joinColumn.referencedColumn.propertyPath;
                 }).join(" AND ");
-                return " " + joinAttr.direction + " JOIN " + _this.getTableName(destinationTableName) + " " + _this.escape(destinationTableAlias) + " ON " + _this.replacePropertyNames(condition + appendedCondition);
+                return " " + joinAttr.direction + " JOIN " + _this.getTableName(destinationTableName) + " " + _this.escape(destinationTableAlias) + _this.createTableLockExpression() + " ON " + _this.replacePropertyNames(condition + appendedCondition);
             }
             else if (relation.isOneToMany || relation.isOneToOneNotOwner) {
                 // JOIN `post` `post` ON `post`.`categoryId` = `category`.`id`
@@ -1124,7 +1110,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
                     return destinationTableAlias + "." + relation.inverseRelation.propertyPath + "." + joinColumn.referencedColumn.propertyPath + "=" +
                         parentAlias + "." + joinColumn.referencedColumn.propertyPath;
                 }).join(" AND ");
-                return " " + joinAttr.direction + " JOIN " + _this.getTableName(destinationTableName) + " " + _this.escape(destinationTableAlias) + " ON " + _this.replacePropertyNames(condition + appendedCondition);
+                return " " + joinAttr.direction + " JOIN " + _this.getTableName(destinationTableName) + " " + _this.escape(destinationTableAlias) + _this.createTableLockExpression() + " ON " + _this.replacePropertyNames(condition + appendedCondition);
             }
             else { // means many-to-many
                 var junctionTableName = relation.junctionEntityMetadata.tablePath;
@@ -1150,8 +1136,8 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
                         return destinationTableAlias + "." + joinColumn.referencedColumn.propertyPath + "=" + junctionAlias_1 + "." + joinColumn.propertyPath;
                     }).join(" AND ");
                 }
-                return " " + joinAttr.direction + " JOIN " + _this.getTableName(junctionTableName) + " " + _this.escape(junctionAlias_1) + " ON " + _this.replacePropertyNames(junctionCondition) +
-                    " " + joinAttr.direction + " JOIN " + _this.getTableName(destinationTableName) + " " + _this.escape(destinationTableAlias) + " ON " + _this.replacePropertyNames(destinationCondition + appendedCondition);
+                return " " + joinAttr.direction + " JOIN " + _this.getTableName(junctionTableName) + " " + _this.escape(junctionAlias_1) + _this.createTableLockExpression() + " ON " + _this.replacePropertyNames(junctionCondition) +
+                    " " + joinAttr.direction + " JOIN " + _this.getTableName(destinationTableName) + " " + _this.escape(destinationTableAlias) + _this.createTableLockExpression() + " ON " + _this.replacePropertyNames(destinationCondition + appendedCondition);
             }
         });
         return joins.join(" ");
@@ -1245,6 +1231,27 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
         }
         return "";
     };
+    /**
+     * Creates "LOCK" part of SELECT Query after table Clause
+     * ex.
+     *  SELECT 1
+     *  FROM USER U WITH (NOLOCK)
+     *  JOIN ORDER O WITH (NOLOCK)
+     *      ON U.ID=O.OrderID
+     */
+    SelectQueryBuilder.prototype.createTableLockExpression = function () {
+        if (this.connection.driver instanceof SqlServerDriver) {
+            switch (this.expressionMap.lockMode) {
+                case "pessimistic_read":
+                    return " WITH (HOLDLOCK, ROWLOCK)";
+                case "pessimistic_write":
+                    return " WITH (UPDLOCK, ROWLOCK)";
+                case "dirty_read":
+                    return " WITH (NOLOCK)";
+            }
+        }
+        return "";
+    };
     /**
      * Creates "LOCK" part of SQL query.
      */