typeorm 0.2.38-dev.d8f6037 → 0.2.39-dev.179ae75

package/query-builder/SelectQueryBuilder.js

@@ -23,7 +23,6 @@ var PostgresDriver_1 = require("../driver/postgres/PostgresDriver");
 var OracleDriver_1 = require("../driver/oracle/OracleDriver");
 var AbstractSqliteDriver_1 = require("../driver/sqlite-abstract/AbstractSqliteDriver");
 var OffsetWithoutLimitNotSupportedError_1 = require("../error/OffsetWithoutLimitNotSupportedError");
-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");
@@ -34,7 +33,7 @@ var error_1 = require("../error");
  * Allows to build complex sql queries in a fashion way and execute those queries.
  */
 var SelectQueryBuilder = /** @class */ (function (_super) {
-    tslib_1.__extends(SelectQueryBuilder, _super);
+    (0, tslib_1.__extends)(SelectQueryBuilder, _super);
     function SelectQueryBuilder() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
@@ -529,8 +528,8 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      * Gets first raw result returned by execution of generated query builder sql.
      */
     SelectQueryBuilder.prototype.getRawOne = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.getRawMany()];
                     case 1: return [2 /*return*/, (_a.sent())[0]];
@@ -542,9 +541,9 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      * Gets all raw results returned by execution of generated query builder sql.
      */
     SelectQueryBuilder.prototype.getRawMany = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var queryRunner, transactionStartedByUs, results, error_2, rollbackError_1;
-            return tslib_1.__generator(this, function (_a) {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (this.expressionMap.lockMode === "optimistic")
@@ -600,9 +599,9 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      * Executes sql generated by query builder and returns object with raw results and entities created from them.
      */
     SelectQueryBuilder.prototype.getRawAndEntities = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var queryRunner, transactionStartedByUs, results, error_3, rollbackError_2;
-            return tslib_1.__generator(this, function (_a) {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         queryRunner = this.obtainQueryRunner();
@@ -657,9 +656,9 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      * Gets single entity returned by execution of generated query builder sql.
      */
     SelectQueryBuilder.prototype.getOne = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var results, result, metadata, actualVersion, actualVersion;
-            return tslib_1.__generator(this, function (_a) {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.getRawAndEntities()];
                     case 1:
@@ -687,9 +686,9 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      * Gets the first entity returned by execution of generated query builder sql or rejects the returned promise on error.
      */
     SelectQueryBuilder.prototype.getOneOrFail = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var entity;
-            return tslib_1.__generator(this, function (_a) {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.getOne()];
                     case 1:
@@ -706,9 +705,9 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      * Gets entities returned by execution of generated query builder sql.
      */
     SelectQueryBuilder.prototype.getMany = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var results;
-            return tslib_1.__generator(this, function (_a) {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (this.expressionMap.lockMode === "optimistic")
@@ -726,9 +725,9 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      * Count excludes all limitations set by setFirstResult and setMaxResults methods call.
      */
     SelectQueryBuilder.prototype.getCount = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var queryRunner, transactionStartedByUs, results, error_4, rollbackError_3;
-            return tslib_1.__generator(this, function (_a) {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (this.expressionMap.lockMode === "optimistic")
@@ -786,9 +785,9 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      * This method is useful to build pagination.
      */
     SelectQueryBuilder.prototype.getManyAndCount = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var queryRunner, transactionStartedByUs, entitiesAndRaw, count, results, error_5, rollbackError_4;
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var queryRunner, transactionStartedByUs, entitiesAndRaw, cacheId, count, results, error_5, rollbackError_4;
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (this.expressionMap.lockMode === "optimistic")
@@ -810,6 +809,10 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
                     case 4:
                         entitiesAndRaw = _a.sent();
                         this.expressionMap.queryEntity = false;
+                        cacheId = this.expressionMap.cacheId;
+                        // Creates a new cacheId for the count query, or it will retreive the above query results
+                        // and count will return 0.
+                        this.expressionMap.cacheId = (cacheId) ? cacheId + "-count" : cacheId;
                         return [4 /*yield*/, this.executeCountQuery(queryRunner)];
                     case 5:
                         count = _a.sent();
@@ -850,14 +853,14 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      * Executes built SQL query and returns raw data stream.
      */
     SelectQueryBuilder.prototype.stream = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var _a, sql, parameters, queryRunner, transactionStartedByUs, releaseFn, results, error_6, rollbackError_5;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
+            return (0, tslib_1.__generator)(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         this.expressionMap.queryEntity = false;
-                        _a = tslib_1.__read(this.getQueryAndParameters(), 2), sql = _a[0], parameters = _a[1];
+                        _a = (0, tslib_1.__read)(this.getQueryAndParameters(), 2), sql = _a[0], parameters = _a[1];
                         queryRunner = this.obtainQueryRunner();
                         transactionStartedByUs = false;
                         _b.label = 1;
@@ -991,15 +994,15 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
         var excludedSelects = [];
         if (this.expressionMap.mainAlias.hasMetadata) {
             var metadata = this.expressionMap.mainAlias.metadata;
-            allSelects.push.apply(allSelects, tslib_1.__spreadArray([], tslib_1.__read(this.buildEscapedEntityColumnSelects(this.expressionMap.mainAlias.name, metadata))));
-            excludedSelects.push.apply(excludedSelects, tslib_1.__spreadArray([], tslib_1.__read(this.findEntityColumnSelects(this.expressionMap.mainAlias.name, metadata))));
+            allSelects.push.apply(allSelects, (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(this.buildEscapedEntityColumnSelects(this.expressionMap.mainAlias.name, metadata)), false));
+            excludedSelects.push.apply(excludedSelects, (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(this.findEntityColumnSelects(this.expressionMap.mainAlias.name, metadata)), false));
         }
         // add selects from joins
         this.expressionMap.joinAttributes
             .forEach(function (join) {
             if (join.metadata) {
-                allSelects.push.apply(allSelects, tslib_1.__spreadArray([], tslib_1.__read(_this.buildEscapedEntityColumnSelects(join.alias.name, join.metadata))));
-                excludedSelects.push.apply(excludedSelects, tslib_1.__spreadArray([], tslib_1.__read(_this.findEntityColumnSelects(join.alias.name, join.metadata))));
+                allSelects.push.apply(allSelects, (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(_this.buildEscapedEntityColumnSelects(join.alias.name, join.metadata)), false));
+                excludedSelects.push.apply(excludedSelects, (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(_this.findEntityColumnSelects(join.alias.name, join.metadata)), false));
             }
             else {
                 var hasMainAlias = _this.expressionMap.selects.some(function (select) { return select.selection === join.alias.name; });
@@ -1331,18 +1334,18 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
         var hasMainAlias = this.expressionMap.selects.some(function (select) { return select.selection === aliasName; });
         var columns = [];
         if (hasMainAlias) {
-            columns.push.apply(columns, tslib_1.__spreadArray([], tslib_1.__read(metadata.columns.filter(function (column) { return column.isSelect === true; }))));
+            columns.push.apply(columns, (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(metadata.columns.filter(function (column) { return column.isSelect === true; })), false));
         }
-        columns.push.apply(columns, tslib_1.__spreadArray([], tslib_1.__read(metadata.columns.filter(function (column) {
+        columns.push.apply(columns, (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(metadata.columns.filter(function (column) {
             return _this.expressionMap.selects.some(function (select) { return select.selection === aliasName + "." + column.propertyPath; });
-        }))));
+        })), false));
         // if user used partial selection and did not select some primary columns which are required to be selected
         // we select those primary columns and mark them as "virtual". Later virtual column values will be removed from final entity
         // to make entity contain exactly what user selected
         if (columns.length === 0) // however not in the case when nothing (even partial) was selected from this target (for example joins without selection)
             return [];
         var nonSelectedPrimaryColumns = this.expressionMap.queryEntity ? metadata.primaryColumns.filter(function (primaryColumn) { return columns.indexOf(primaryColumn) === -1; }) : [];
-        var allColumns = tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(columns)), tslib_1.__read(nonSelectedPrimaryColumns));
+        var allColumns = (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(columns), false), (0, tslib_1.__read)(nonSelectedPrimaryColumns), false);
         return allColumns.map(function (column) {
             var selection = _this.expressionMap.selects.find(function (select) { return select.selection === aliasName + "." + column.propertyPath; });
             var selectionPath = _this.escape(aliasName) + "." + _this.escape(column.databaseName);
@@ -1428,9 +1431,9 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
             "))";
     };
     SelectQueryBuilder.prototype.executeCountQuery = function (queryRunner) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var countSql, results;
-            return tslib_1.__generator(this, function (_a) {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         countSql = this.computeCountExpression();
@@ -1457,10 +1460,10 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      * Executes sql generated by query builder and returns object with raw results and entities created from them.
      */
     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, alias_1, ids, areAllNumbers, rawRelationIdResults, rawRelationCountResults, transformer, broadcastResult;
+        return (0, 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, alias_1, ids, areAllNumbers, rawRelationIdResults, rawRelationCountResults, transformer;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
+            return (0, tslib_1.__generator)(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!this.expressionMap.mainAlias)
@@ -1480,7 +1483,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
                         relationCountMetadataTransformer.transform();
                         rawResults = [], entities = [];
                         if (!((this.expressionMap.skip || this.expressionMap.take) && this.expressionMap.joinAttributes.length > 0)) return [3 /*break*/, 4];
-                        _a = tslib_1.__read(this.createOrderByCombinedWithSelectExpression("distinctAlias"), 2), selects = _a[0], orderBys_1 = _a[1];
+                        _a = (0, tslib_1.__read)(this.createOrderByCombinedWithSelectExpression("distinctAlias"), 2), selects = _a[0], orderBys_1 = _a[1];
                         metadata_1 = this.expressionMap.mainAlias.metadata;
                         mainAliasName_1 = this.expressionMap.mainAlias.name;
                         querySelects = metadata_1.primaryColumns.map(function (primaryColumn) {
@@ -1552,10 +1555,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
                         transformer = new RawSqlResultsToEntityTransformer_1.RawSqlResultsToEntityTransformer(this.expressionMap, this.connection.driver, rawRelationIdResults, rawRelationCountResults, this.queryRunner);
                         entities = transformer.transform(rawResults, this.expressionMap.mainAlias);
                         if (!(this.expressionMap.callListeners === true && this.expressionMap.mainAlias.hasMetadata)) return [3 /*break*/, 10];
-                        broadcastResult = new BroadcasterResult_1.BroadcasterResult();
-                        queryRunner.broadcaster.broadcastLoadEventsForAll(broadcastResult, this.expressionMap.mainAlias.metadata, entities);
-                        if (!(broadcastResult.promises.length > 0)) return [3 /*break*/, 10];
-                        return [4 /*yield*/, Promise.all(broadcastResult.promises)];
+                        return [4 /*yield*/, queryRunner.broadcaster.broadcast("Load", this.expressionMap.mainAlias.metadata, entities)];
                     case 9:
                         _b.sent();
                         _b.label = 10;
@@ -1613,12 +1613,12 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      * Loads raw results from the database.
      */
     SelectQueryBuilder.prototype.loadRawResults = function (queryRunner) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var _a, sql, parameters, queryId, cacheOptions, savedQueryResultCacheOptions, cacheError, error_7, results, error_8;
-            return tslib_1.__generator(this, function (_b) {
+            return (0, tslib_1.__generator)(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = tslib_1.__read(this.getQueryAndParameters(), 2), sql = _a[0], parameters = _a[1];
+                        _a = (0, tslib_1.__read)(this.getQueryAndParameters(), 2), sql = _a[0], parameters = _a[1];
                         queryId = sql + " -- PARAMETERS: " + JSON.stringify(parameters);
                         cacheOptions = typeof this.connection.options.cache === "object" ? this.connection.options.cache : {};
                         savedQueryResultCacheOptions = undefined;