typeorm 0.3.10 → 0.3.11-dev.1cb738a

package/browser/query-builder/SelectQueryBuilder.js

@@ -1482,8 +1482,12 @@ export class SelectQueryBuilder extends QueryBuilder {
             : [];
         const allColumns = [...columns, ...nonSelectedPrimaryColumns];
         const finalSelects = [];
+        const escapedAliasName = this.escape(aliasName);
         allColumns.forEach((column) => {
-            let selectionPath = this.escape(aliasName) + "." + this.escape(column.databaseName);
+            let selectionPath = escapedAliasName + "." + this.escape(column.databaseName);
+            if (column.isVirtualProperty && column.query) {
+                selectionPath = `(${column.query(escapedAliasName)})`;
+            }
             if (this.connection.driver.spatialTypes.indexOf(column.type) !== -1) {
                 if (DriverUtils.isMySQLFamily(this.connection.driver) ||
                     this.connection.driver.options.type === "aurora-mysql") {
@@ -2260,7 +2264,19 @@ export class SelectQueryBuilder extends QueryBuilder {
                         : (nulls === null || nulls === void 0 ? void 0 : nulls.toLowerCase()) === "last"
                             ? "NULLS LAST"
                             : undefined;
-                this.addOrderBy(`${alias}.${propertyPath}`, direction, nulls);
+                let aliasPath = `${alias}.${propertyPath}`;
+                if (column.isVirtualProperty && column.query) {
+                    const selection = this.expressionMap.selects.find((s) => s.selection === aliasPath);
+                    if (selection) {
+                        // this is not building correctly now???
+                        aliasPath = DriverUtils.buildAlias(this.connection.driver, alias, column.databaseName);
+                        selection.aliasName = aliasPath;
+                    }
+                    else {
+                        aliasPath = `(${column.query(alias)})`;
+                    }
+                }
+                this.addOrderBy(aliasPath, direction, nulls);
                 // this.orderBys.push({ alias: alias + "." + propertyPath, direction, nulls });
             }
             else if (embed) {
@@ -2314,7 +2330,10 @@ export class SelectQueryBuilder extends QueryBuilder {
                 if (!embed && !column && !relation)
                     throw new EntityPropertyNotFoundError(propertyPath, metadata);
                 if (column) {
-                    const aliasPath = `${alias}.${propertyPath}`;
+                    let aliasPath = `${alias}.${propertyPath}`;
+                    if (column.isVirtualProperty && column.query) {
+                        aliasPath = `(${column.query(alias)})`;
+                    }
                     // const parameterName = alias + "_" + propertyPath.split(".").join("_") + "_" + parameterIndex;
                     // todo: we need to handle other operators as well?
                     let parameterValue = where[key];
@@ -2446,7 +2465,7 @@ export class SelectQueryBuilder extends QueryBuilder {
                         const existJoin = this.joins.find((join) => join.alias === joinAlias);
                         if (!existJoin) {
                             this.joins.push({
-                                type: "inner",
+                                type: "left",
                                 select: false,
                                 selection: undefined,
                                 alias: joinAlias,
@@ -2454,10 +2473,6 @@ export class SelectQueryBuilder extends QueryBuilder {
                                 relationMetadata: relation,
                             });
                         }
-                        else {
-                            if (existJoin.type === "left")
-                                existJoin.type = "inner";
-                        }
                         const condition = this.buildWhere(where[key], relation.inverseEntityMetadata, joinAlias);
                         if (condition) {
                             andConditions.push(condition);