typeorm 0.2.40-dev.d039319 → 0.2.40-dev.e80f97d

package/browser/find-options/FindConditions.d.ts

@@ -2,6 +2,10 @@ import { FindOperator } from "./FindOperator";
 /**
  * Used for find operations.
  */
-export declare type FindConditions<T> = {
-    [P in keyof T]?: FindConditions<T[P]> | FindOperator<FindConditions<T[P]>>;
+export declare type FindCondition<T> = FindConditions<T> | FindOperator<FindConditions<T>>;
+/**
+ * Used for find operations.
+ */
+export declare type FindConditions<T> = T | {
+    [P in keyof T]?: T[P] extends Promise<infer U> ? FindCondition<U> : FindCondition<T[P]>;
 };

package/browser/find-options/FindConditions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../browser/src/find-options/FindConditions.ts"],"names":[],"mappings":"","file":"FindConditions.js","sourcesContent":["import {FindOperator} from \"./FindOperator\";\n\n/**\n * Used for find operations.\n */\nexport type FindConditions<T> = {\n    [P in keyof T]?: FindConditions<T[P]> | FindOperator<FindConditions<T[P]>>;\n};\n"],"sourceRoot":".."}
+{"version":3,"sources":["../browser/src/find-options/FindConditions.ts"],"names":[],"mappings":"","file":"FindConditions.js","sourcesContent":["import {FindOperator} from \"./FindOperator\";\n\n/**\n * Used for find operations.\n */\nexport type FindCondition<T> = FindConditions<T> | FindOperator<FindConditions<T>>;\n\n/**\n * Used for find operations.\n */\nexport type FindConditions<T> = T | {\n    [P in keyof T]?: T[P] extends Promise<infer U>\n        ? FindCondition<U>\n        : FindCondition<T[P]>;\n};\n"],"sourceRoot":".."}

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

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

package/browser/query-builder/SelectQueryBuilder.js

@@ -1474,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, 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 __generator(this, function (_b) {
                 switch (_b.label) {
@@ -1496,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"), 3), selects = _a[0], orderBys_1 = _a[1], subquerySelect = _a[2];
+                        _a = __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) {
@@ -1510,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().addSelect(subquerySelect).getQuery() + ")", "distinctAlias")
+                                .from("(" + this.clone().orderBy().getQuery() + ")", "distinctAlias")
                                 .offset(this.expressionMap.skip)
                                 .limit(this.expressionMap.take)
                                 .orderBy(orderBys_1)
@@ -1620,23 +1620,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.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.