typeorm 0.2.39-dev.6558295 → 0.2.39-dev.6929ae3

package/browser/query-builder/SelectQueryBuilder.d.ts

@@ -597,7 +597,7 @@ export declare class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> imp
         entities: Entity[];
         raw: any[];
     }>;
-    protected createOrderByCombinedWithSelectExpression(parentAlias: string): [string, OrderByCondition];
+    protected createOrderByCombinedWithSelectExpression(parentAlias: string): [string, OrderByCondition, string];
     /**
      * Loads raw results from the database.
      */

package/browser/query-builder/SelectQueryBuilder.js

@@ -1458,7 +1458,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) {
@@ -1480,7 +1480,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) {
@@ -1494,7 +1494,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)
@@ -1604,7 +1604,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.