typeorm 0.2.39-dev.dd94c9d → 0.2.39

package/browser/query-builder/SelectQueryBuilder.js

@@ -505,6 +505,15 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
             throw new TypeORMError("Provided \"skip\" value is not a number. Please provide a numeric value.");
         return this;
     };
+    /**
+     * Set certain index to be used by the query.
+     *
+     * @param index Name of index to be used.
+     */
+    SelectQueryBuilder.prototype.useIndex = function (index) {
+        this.expressionMap.useIndex = index;
+        return this;
+    };
     /**
      * Sets locking mode.
      */
@@ -783,7 +792,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      */
     SelectQueryBuilder.prototype.getManyAndCount = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var queryRunner, transactionStartedByUs, entitiesAndRaw, count, results, error_4, rollbackError_4;
+            var queryRunner, transactionStartedByUs, entitiesAndRaw, cacheId, count, results, error_4, rollbackError_4;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -806,6 +815,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();
@@ -1027,6 +1040,13 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
                     break;
             }
         }
+        // Use certain index
+        var useIndex = "";
+        if (this.expressionMap.useIndex) {
+            if (this.connection.driver instanceof MysqlDriver) {
+                useIndex = " USE INDEX (" + this.expressionMap.useIndex + ")";
+            }
+        }
         // create a selection query
         var froms = this.expressionMap.aliases
             .filter(function (alias) { return alias.type === "from" && (alias.tablePath || alias.subQuery); })
@@ -1037,7 +1057,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;
+        return select + selection + " FROM " + froms.join(", ") + lock + useIndex;
     };
     /**
      * Creates select | select distinct part of SQL query.
@@ -1454,7 +1474,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      */
     SelectQueryBuilder.prototype.executeEntitiesAndRawResults = function (queryRunner) {
         return __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 metadata, relationIdLoader, relationCountLoader, relationIdMetadataTransformer, relationCountMetadataTransformer, rawResults, entities, _a, selects, orderBys_1, subquerySelect, metadata_1, mainAliasName_1, querySelects, condition, parameters_1, alias_1, ids, areAllNumbers, rawRelationIdResults, rawRelationCountResults, transformer;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -1476,7 +1496,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 = __read(this.createOrderByCombinedWithSelectExpression("distinctAlias"), 2), selects = _a[0], orderBys_1 = _a[1];
+                        _a = __read(this.createOrderByCombinedWithSelectExpression("distinctAlias"), 3), selects = _a[0], orderBys_1 = _a[1], subquerySelect = _a[2];
                         metadata_1 = this.expressionMap.mainAlias.metadata;
                         mainAliasName_1 = this.expressionMap.mainAlias.name;
                         querySelects = metadata_1.primaryColumns.map(function (primaryColumn) {
@@ -1490,7 +1510,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
                         return [4 /*yield*/, new SelectQueryBuilder(this.connection, queryRunner)
                                 .select("DISTINCT " + querySelects.join(", "))
                                 .addSelect(selects)
-                                .from("(" + this.clone().orderBy().getQuery() + ")", "distinctAlias")
+                                .from("(" + this.clone().orderBy().addSelect(subquerySelect).getQuery() + ")", "distinctAlias")
                                 .offset(this.expressionMap.skip)
                                 .limit(this.expressionMap.take)
                                 .orderBy(orderBys_1)
@@ -1600,7 +1620,23 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
                 }
             }
         });
-        return [selectString, orderByObject];
+        var subquerySelectString = Object.keys(orderBys)
+            .filter(function (orderCriteria) { return orderCriteria.includes("."); })
+            .map(function (orderCriteria) {
+            var criteriaParts = orderCriteria.split(".");
+            var aliasName = criteriaParts[0];
+            var propertyPath = criteriaParts.slice(1).join(".");
+            var alias = _this.expressionMap.findAliasByName(aliasName);
+            if (alias.type !== "join") {
+                return "";
+            }
+            var column = alias.metadata.findColumnWithPropertyPath(propertyPath);
+            var property = _this.escape(alias.name) + "." + _this.escape(column.databaseName);
+            var propertyAlias = _this.escape(DriverUtils.buildAlias(_this.connection.driver, aliasName, column.databaseName));
+            return [property, "AS", propertyAlias].join(" ");
+        })
+            .join(", ");
+        return [selectString, orderByObject, subquerySelectString];
     };
     /**
      * Loads raw results from the database.