typeorm 0.3.26 → 0.3.27-dev.1f90467

package/browser/decorator/options/VirtualColumnOptions.d.ts

@@ -8,6 +8,11 @@ export interface VirtualColumnOptions {
      * Column type. Must be one of the value from the ColumnTypes class.
      */
     type?: ColumnType;
+    /**
+     * Indicates if column is always selected by QueryBuilder and find operations.
+     * Default value is "true".
+     */
+    select?: boolean;
     /**
      * Return type of HSTORE column.
      * Returns value as string or as object.

package/browser/decorator/options/VirtualColumnOptions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../browser/src/decorator/options/VirtualColumnOptions.ts"],"names":[],"mappings":"","file":"VirtualColumnOptions.js","sourcesContent":["import { ColumnType } from \"../../driver/types/ColumnTypes\"\nimport { ValueTransformer } from \"./ValueTransformer\"\n\n/**\n * Describes all calculated column's options.\n */\nexport interface VirtualColumnOptions {\n    /**\n     * Column type. Must be one of the value from the ColumnTypes class.\n     */\n    type?: ColumnType\n\n    /**\n     * Return type of HSTORE column.\n     * Returns value as string or as object.\n     */\n    hstoreType?: \"object\" | \"string\"\n\n    /**\n     * Query to be used to populate the column data. This query is used when generating the relational db script.\n     * The query function is called with the current entities alias either defined by the Entity Decorator or automatically\n     * @See https://typeorm.io/decorator-reference#virtualcolumn for more details.\n     */\n    query: (alias: string) => string\n\n    /**\n     * Specifies a value transformer(s) that is to be used to unmarshal\n     * this column when reading from the database.\n     */\n    transformer?: ValueTransformer | ValueTransformer[]\n}\n"],"sourceRoot":"../.."}
+{"version":3,"sources":["../browser/src/decorator/options/VirtualColumnOptions.ts"],"names":[],"mappings":"","file":"VirtualColumnOptions.js","sourcesContent":["import { ColumnType } from \"../../driver/types/ColumnTypes\"\nimport { ValueTransformer } from \"./ValueTransformer\"\n\n/**\n * Describes all calculated column's options.\n */\nexport interface VirtualColumnOptions {\n    /**\n     * Column type. Must be one of the value from the ColumnTypes class.\n     */\n    type?: ColumnType\n\n    /**\n     * Indicates if column is always selected by QueryBuilder and find operations.\n     * Default value is \"true\".\n     */\n    select?: boolean\n\n    /**\n     * Return type of HSTORE column.\n     * Returns value as string or as object.\n     */\n    hstoreType?: \"object\" | \"string\"\n\n    /**\n     * Query to be used to populate the column data. This query is used when generating the relational db script.\n     * The query function is called with the current entities alias either defined by the Entity Decorator or automatically\n     * @See https://typeorm.io/decorator-reference#virtualcolumn for more details.\n     */\n    query: (alias: string) => string\n\n    /**\n     * Specifies a value transformer(s) that is to be used to unmarshal\n     * this column when reading from the database.\n     */\n    transformer?: ValueTransformer | ValueTransformer[]\n}\n"],"sourceRoot":"../.."}

package/browser/query-builder/SelectQueryBuilder.js

@@ -904,6 +904,11 @@ export class SelectQueryBuilder extends QueryBuilder {
         const hasOffset = this.expressionMap.offset !== undefined &&
             this.expressionMap.offset !== null &&
             this.expressionMap.offset > 0;
+        if (entitiesAndRaw.entities.length === 0 && (hasSkip || hasOffset)) {
+            // when skip or offset were used and no results found, we need to execute a full count
+            // (the given offset may have exceeded the actual number of rows)
+            return undefined;
+        }
         // offset overrides skip when no join is defined
         const previousResults = hasOffset
             ? this.expressionMap.offset
@@ -1667,12 +1672,9 @@ export class SelectQueryBuilder extends QueryBuilder {
         return finalSelects;
     }
     findEntityColumnSelects(aliasName, metadata) {
-        const mainSelect = this.expressionMap.selects.find((select) => select.selection === aliasName);
-        if (mainSelect)
-            return [mainSelect];
-        return this.expressionMap.selects.filter((select) => {
-            return metadata.columns.some((column) => select.selection === aliasName + "." + column.propertyPath);
-        });
+        return this.expressionMap.selects.filter((select) => select.selection === aliasName ||
+            metadata.columns.some((column) => select.selection ===
+                aliasName + "." + column.propertyPath));
     }
     computeCountExpression() {
         const mainAlias = this.expressionMap.mainAlias.name; // todo: will this work with "fromTableName"?