typeorm 0.2.39 → 0.2.40-dev.0334d10

package/query-builder/SelectQueryBuilder.js

@@ -1477,7 +1477,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
      */
     SelectQueryBuilder.prototype.executeEntitiesAndRawResults = function (queryRunner) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            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 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 (0, tslib_1.__generator)(this, function (_b) {
                 switch (_b.label) {
@@ -1499,7 +1499,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 = (0, tslib_1.__read)(this.createOrderByCombinedWithSelectExpression("distinctAlias"), 3), selects = _a[0], orderBys_1 = _a[1], subquerySelect = _a[2];
+                        _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) {
@@ -1513,7 +1513,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
                         return [4 /*yield*/, new SelectQueryBuilder(this.connection, queryRunner)
                                 .select("DISTINCT " + querySelects.join(", "))
                                 .addSelect(selects)
-                                .from("(" + this.clone().orderBy().addSelect(subquerySelect).getQuery() + ")", "distinctAlias")
+                                .from("(" + this.clone().orderBy().getQuery() + ")", "distinctAlias")
                                 .offset(this.expressionMap.skip)
                                 .limit(this.expressionMap.take)
                                 .orderBy(orderBys_1)
@@ -1623,23 +1623,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
                 }
             }
         });
-        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_1.DriverUtils.buildAlias(_this.connection.driver, aliasName, column.databaseName));
-            return [property, "AS", propertyAlias].join(" ");
-        })
-            .join(", ");
-        return [selectString, orderByObject, subquerySelectString];
+        return [selectString, orderByObject];
     };
     /**
      * Loads raw results from the database.