typeorm 0.2.24 → 0.2.28

package/query-builder/SelectQueryBuilder.d.ts

@@ -6,7 +6,7 @@ import { SelectQuery } from "./SelectQuery";
 import { EntityMetadata } from "../metadata/EntityMetadata";
 import { OrderByCondition } from "../find-options/OrderByCondition";
 import { QueryExpressionMap } from "./QueryExpressionMap";
-import { ObjectType } from "../common/ObjectType";
+import { EntityTarget } from "../common/EntityTarget";
 import { QueryRunner } from "../query-runner/QueryRunner";
 import { WhereExpression } from "./WhereExpression";
 import { Brackets } from "./Brackets";
@@ -74,7 +74,7 @@ export declare class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> imp
      * Also sets a main string alias of the selection data.
      * Removes all previously set from-s.
      */
-    from<T>(entityTarget: ObjectType<T> | string, aliasName: string): SelectQueryBuilder<T>;
+    from<T>(entityTarget: EntityTarget<T>, aliasName: string): SelectQueryBuilder<T>;
     /**
      * Specifies FROM which entity's table select/update/delete will be executed.
      * Also sets a main string alias of the selection data.
@@ -84,7 +84,7 @@ export declare class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> imp
      * Specifies FROM which entity's table select/update/delete will be executed.
      * Also sets a main string alias of the selection data.
      */
-    addFrom<T>(entityTarget: ObjectType<T> | string, aliasName: string): SelectQueryBuilder<T>;
+    addFrom<T>(entityTarget: EntityTarget<T>, aliasName: string): SelectQueryBuilder<T>;
     /**
      * INNER JOINs (without selection) given subquery.
      * You also need to specify an alias of the joined data.
@@ -489,7 +489,7 @@ export declare class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> imp
     /**
      * Sets locking mode.
      */
-    setLock(lockMode: "pessimistic_read" | "pessimistic_write" | "dirty_read"): this;
+    setLock(lockMode: "pessimistic_read" | "pessimistic_write" | "dirty_read" | "pessimistic_partial_write" | "pessimistic_write_or_fail" | "for_no_key_update"): this;
     /**
      * Disables the global condition of "non-deleted" for the entity with delete date columns.
      */

package/query-builder/SelectQueryBuilder.js

@@ -26,6 +26,7 @@ var BroadcasterResult_1 = require("../subscriber/BroadcasterResult");
 var ObjectUtils_1 = require("../util/ObjectUtils");
 var DriverUtils_1 = require("../driver/DriverUtils");
 var AuroraDataApiDriver_1 = require("../driver/aurora-data-api/AuroraDataApiDriver");
+var CockroachDriver_1 = require("../driver/cockroachdb/CockroachDriver");
 /**
  * Allows to build complex sql queries in a fashion way and execute those queries.
  */
@@ -421,8 +422,8 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      * calling this function will override previously set ORDER BY conditions.
      */
     SelectQueryBuilder.prototype.orderBy = function (sort, order, nulls) {
-        if (order === void 0) { order = "ASC"; }
         var _a, _b;
+        if (order === void 0) { order = "ASC"; }
         if (order !== undefined && order !== "ASC" && order !== "DESC")
             throw new Error("SelectQueryBuilder.addOrderBy \"order\" can accept only \"ASC\" and \"DESC\" values.");
         if (nulls !== undefined && nulls !== "NULLS FIRST" && nulls !== "NULLS LAST")
@@ -1231,6 +1232,27 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
                 else {
                     throw new LockNotSupportedOnGivenDriverError_1.LockNotSupportedOnGivenDriverError();
                 }
+            case "pessimistic_partial_write":
+                if (driver instanceof PostgresDriver_1.PostgresDriver) {
+                    return " FOR UPDATE SKIP LOCKED";
+                }
+                else {
+                    throw new LockNotSupportedOnGivenDriverError_1.LockNotSupportedOnGivenDriverError();
+                }
+            case "pessimistic_write_or_fail":
+                if (driver instanceof PostgresDriver_1.PostgresDriver) {
+                    return " FOR UPDATE NOWAIT";
+                }
+                else {
+                    throw new LockNotSupportedOnGivenDriverError_1.LockNotSupportedOnGivenDriverError();
+                }
+            case "for_no_key_update":
+                if (driver instanceof PostgresDriver_1.PostgresDriver) {
+                    return " FOR NO KEY UPDATE";
+                }
+                else {
+                    throw new LockNotSupportedOnGivenDriverError_1.LockNotSupportedOnGivenDriverError();
+                }
             default:
                 return "";
         }
@@ -1322,6 +1344,18 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
                                     return distinctAlias + "." + propertyName;
                                 }).join(" || ") + ")) as \"cnt\"";
                             }
+                            else if (this.connection.driver instanceof CockroachDriver_1.CockroachDriver) {
+                                countSql = "COUNT(DISTINCT(CONCAT(" + metadata.primaryColumns.map(function (primaryColumn, index) {
+                                    var propertyName = _this.escape(primaryColumn.databaseName);
+                                    return distinctAlias + "." + propertyName + "::text";
+                                }).join(", ") + "))) as \"cnt\"";
+                            }
+                            else if (this.connection.driver instanceof OracleDriver_1.OracleDriver) {
+                                countSql = "COUNT(DISTINCT(" + metadata.primaryColumns.map(function (primaryColumn, index) {
+                                    var propertyName = _this.escape(primaryColumn.databaseName);
+                                    return distinctAlias + "." + propertyName;
+                                }).join(" || ") + ")) as \"cnt\"";
+                            }
                             else {
                                 countSql = "COUNT(DISTINCT(CONCAT(" + metadata.primaryColumns.map(function (primaryColumn, index) {
                                     var propertyName = _this.escape(primaryColumn.databaseName);
@@ -1359,14 +1393,14 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      */
     SelectQueryBuilder.prototype.executeEntitiesAndRawResults = function (queryRunner) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var metadata, relationIdLoader, relationCountLoader, relationIdMetadataTransformer, relationCountMetadataTransformer, rawResults, entities, _a, selects, orderBys_1, metadata_1, mainAliasName_1, querySelects, condition, parameters_1, ids, areAllNumbers, rawRelationIdResults, rawRelationCountResults, transformer, broadcastResult;
+            var metadata, relationIdLoader, relationCountLoader, relationIdMetadataTransformer, relationCountMetadataTransformer, rawResults, entities, _a, selects, orderBys_1, metadata_1, mainAliasName_1, querySelects, condition, parameters_1, alias_1, ids, areAllNumbers, rawRelationIdResults, rawRelationCountResults, transformer, broadcastResult;
             var _this = this;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!this.expressionMap.mainAlias)
                             throw new Error("Alias is not set. Use \"from\" method to set an alias.");
-                        if ((this.expressionMap.lockMode === "pessimistic_read" || this.expressionMap.lockMode === "pessimistic_write") && !queryRunner.isTransactionActive)
+                        if ((this.expressionMap.lockMode === "pessimistic_read" || this.expressionMap.lockMode === "pessimistic_write" || this.expressionMap.lockMode === "pessimistic_partial_write" || this.expressionMap.lockMode === "pessimistic_write_or_fail" || this.expressionMap.lockMode === "for_no_key_update") && !queryRunner.isTransactionActive)
                             throw new PessimisticLockTransactionRequiredError_1.PessimisticLockTransactionRequiredError();
                         if (this.expressionMap.lockMode === "optimistic") {
                             metadata = this.expressionMap.mainAlias.metadata;
@@ -1389,7 +1423,8 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
                             var columnAlias = _this.escape(DriverUtils_1.DriverUtils.buildColumnAlias(_this.connection.driver, mainAliasName_1, primaryColumn.databaseName));
                             if (!orderBys_1[columnAlias]) // make sure we aren't overriding user-defined order in inverse direction
                                 orderBys_1[columnAlias] = "ASC";
-                            return distinctAlias + "." + columnAlias + " as \"ids_" + DriverUtils_1.DriverUtils.buildColumnAlias(_this.connection.driver, mainAliasName_1, primaryColumn.databaseName) + "\"";
+                            var alias = DriverUtils_1.DriverUtils.buildColumnAlias(_this.connection.driver, "ids_" + mainAliasName_1, primaryColumn.databaseName);
+                            return distinctAlias + "." + columnAlias + " as \"" + alias + "\"";
                         });
                         return [4 /*yield*/, new SelectQueryBuilder(this.connection, queryRunner)
                                 .select("DISTINCT " + querySelects.join(", "))
@@ -1417,7 +1452,8 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
                             }).join(" OR ");
                         }
                         else {
-                            ids = rawResults.map(function (result) { return result["ids_" + DriverUtils_1.DriverUtils.buildColumnAlias(_this.connection.driver, mainAliasName_1, metadata_1.primaryColumns[0].databaseName)]; });
+                            alias_1 = DriverUtils_1.DriverUtils.buildColumnAlias(this.connection.driver, "ids_" + mainAliasName_1, metadata_1.primaryColumns[0].databaseName);
+                            ids = rawResults.map(function (result) { return result[alias_1]; });
                             areAllNumbers = ids.every(function (id) { return typeof id === "number"; });
                             if (areAllNumbers) {
                                 // fixes #190. if all numbers then its safe to perform query without parameter