typeorm 0.3.22-dev.72145b8 → 0.3.22-dev.ae96f87

package/browser/decorator/relations/RelationCount.d.ts

@@ -2,6 +2,7 @@ import { SelectQueryBuilder } from "../../query-builder/SelectQueryBuilder";
 /**
  * Holds a number of children in the closure table of the column.
  *
- * @deprecated Do not use this decorator, it may be removed in the future versions
+ * @deprecated This decorator will removed in the future versions.
+ * Use {@link VirtualColumn} to calculate the count instead.
  */
 export declare function RelationCount<T>(relation: string | ((object: T) => any), alias?: string, queryBuilderFactory?: (qb: SelectQueryBuilder<any>) => SelectQueryBuilder<any>): PropertyDecorator;

package/browser/decorator/relations/RelationCount.js

@@ -2,7 +2,8 @@ import { getMetadataArgsStorage } from "../../globals";
 /**
  * Holds a number of children in the closure table of the column.
  *
- * @deprecated Do not use this decorator, it may be removed in the future versions
+ * @deprecated This decorator will removed in the future versions.
+ * Use {@link VirtualColumn} to calculate the count instead.
  */
 export function RelationCount(relation, alias, queryBuilderFactory) {
     return function (object, propertyName) {

package/browser/decorator/relations/RelationCount.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../browser/src/decorator/relations/RelationCount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAItD;;;;GAIG;AACH,MAAM,UAAU,aAAa,CACzB,QAAuC,EACvC,KAAc,EACd,mBAE4B;IAE5B,OAAO,UAAU,MAAc,EAAE,YAAoB;QACjD,sBAAsB,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC;YACzC,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY,EAAE,YAAY;YAC1B,QAAQ,EAAE,QAAQ;YAClB,KAAK,EAAE,KAAK;YACZ,mBAAmB,EAAE,mBAAmB;SACd,CAAC,CAAA;IACnC,CAAC,CAAA;AACL,CAAC","file":"RelationCount.js","sourcesContent":["import { getMetadataArgsStorage } from \"../../globals\"\nimport { RelationCountMetadataArgs } from \"../../metadata-args/RelationCountMetadataArgs\"\nimport { SelectQueryBuilder } from \"../../query-builder/SelectQueryBuilder\"\n\n/**\n * Holds a number of children in the closure table of the column.\n *\n * @deprecated Do not use this decorator, it may be removed in the future versions\n */\nexport function RelationCount<T>(\n    relation: string | ((object: T) => any),\n    alias?: string,\n    queryBuilderFactory?: (\n        qb: SelectQueryBuilder<any>,\n    ) => SelectQueryBuilder<any>,\n): PropertyDecorator {\n    return function (object: Object, propertyName: string) {\n        getMetadataArgsStorage().relationCounts.push({\n            target: object.constructor,\n            propertyName: propertyName,\n            relation: relation,\n            alias: alias,\n            queryBuilderFactory: queryBuilderFactory,\n        } as RelationCountMetadataArgs)\n    }\n}\n"],"sourceRoot":"../.."}
+{"version":3,"sources":["../browser/src/decorator/relations/RelationCount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAItD;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CACzB,QAAuC,EACvC,KAAc,EACd,mBAE4B;IAE5B,OAAO,UAAU,MAAc,EAAE,YAAoB;QACjD,sBAAsB,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC;YACzC,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY,EAAE,YAAY;YAC1B,QAAQ,EAAE,QAAQ;YAClB,KAAK,EAAE,KAAK;YACZ,mBAAmB,EAAE,mBAAmB;SACd,CAAC,CAAA;IACnC,CAAC,CAAA;AACL,CAAC","file":"RelationCount.js","sourcesContent":["import { getMetadataArgsStorage } from \"../../globals\"\nimport { RelationCountMetadataArgs } from \"../../metadata-args/RelationCountMetadataArgs\"\nimport { SelectQueryBuilder } from \"../../query-builder/SelectQueryBuilder\"\n\n/**\n * Holds a number of children in the closure table of the column.\n *\n * @deprecated This decorator will removed in the future versions.\n * Use {@link VirtualColumn} to calculate the count instead.\n */\nexport function RelationCount<T>(\n    relation: string | ((object: T) => any),\n    alias?: string,\n    queryBuilderFactory?: (\n        qb: SelectQueryBuilder<any>,\n    ) => SelectQueryBuilder<any>,\n): PropertyDecorator {\n    return function (object: Object, propertyName: string) {\n        getMetadataArgsStorage().relationCounts.push({\n            target: object.constructor,\n            propertyName: propertyName,\n            relation: relation,\n            alias: alias,\n            queryBuilderFactory: queryBuilderFactory,\n        } as RelationCountMetadataArgs)\n    }\n}\n"],"sourceRoot":"../.."}

package/browser/query-builder/SelectQueryBuilder.js

@@ -1615,10 +1615,6 @@ export class SelectQueryBuilder extends QueryBuilder {
                 });
             }
             else {
-                if (column.isVirtualProperty) {
-                    // Do not add unselected virtual properties to final select
-                    return;
-                }
                 finalSelects.push({
                     selection: selectionPath,
                     aliasName: DriverUtils.buildAlias(this.connection.driver, undefined, aliasName, column.databaseName),
@@ -2460,8 +2456,8 @@ export class SelectQueryBuilder extends QueryBuilder {
             }
         }
         else {
-            let andConditions = [];
-            for (let key in where) {
+            const andConditions = [];
+            for (const key in where) {
                 if (where[key] === undefined || where[key] === null)
                     continue;
                 const propertyPath = embedPrefix ? embedPrefix + "." + key : key;
@@ -2473,7 +2469,7 @@ export class SelectQueryBuilder extends QueryBuilder {
                 if (column) {
                     let aliasPath = `${alias}.${propertyPath}`;
                     if (column.isVirtualProperty && column.query) {
-                        aliasPath = `(${column.query(alias)})`;
+                        aliasPath = `(${column.query(this.escape(alias))})`;
                     }
                     // const parameterName = alias + "_" + propertyPath.split(".").join("_") + "_" + parameterIndex;
                     // todo: we need to handle other operators as well?
@@ -2482,10 +2478,12 @@ export class SelectQueryBuilder extends QueryBuilder {
                         parameterValue = where[key].value;
                     }
                     if (column.transformer) {
-                        parameterValue instanceof FindOperator
-                            ? parameterValue.transformValue(column.transformer)
-                            : (parameterValue =
-                                ApplyValueTransformers.transformTo(column.transformer, parameterValue));
+                        if (parameterValue instanceof FindOperator) {
+                            parameterValue.transformValue(column.transformer);
+                        }
+                        else {
+                            parameterValue = ApplyValueTransformers.transformTo(column.transformer, parameterValue);
+                        }
                     }
                     // if (parameterValue === null) {
                     //     andConditions.push(`${aliasPath} IS NULL`);