@cubejs-backend/schema-compiler 1.2.27 → 1.2.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/adapter/BaseFilter.d.ts +1 -1
- package/dist/src/adapter/BaseQuery.d.ts +2 -1
- package/dist/src/adapter/BaseQuery.d.ts.map +1 -1
- package/dist/src/adapter/BaseQuery.js +17 -9
- package/dist/src/adapter/BaseQuery.js.map +1 -1
- package/dist/src/adapter/BigqueryQuery.js +1 -1
- package/dist/src/adapter/BigqueryQuery.js.map +1 -1
- package/dist/src/adapter/Granularity.d.ts +2 -1
- package/dist/src/adapter/Granularity.d.ts.map +1 -1
- package/dist/src/adapter/Granularity.js +11 -0
- package/dist/src/adapter/Granularity.js.map +1 -1
- package/dist/src/adapter/PostgresQuery.d.ts.map +1 -1
- package/dist/src/adapter/PostgresQuery.js +3 -0
- package/dist/src/adapter/PostgresQuery.js.map +1 -1
- package/dist/src/compiler/CubeSymbols.d.ts +1 -1
- package/dist/src/compiler/CubeSymbols.d.ts.map +1 -1
- package/dist/src/compiler/CubeSymbols.js +42 -21
- package/dist/src/compiler/CubeSymbols.js.map +1 -1
- package/dist/src/compiler/CubeValidator.js +2 -2
- package/dist/src/compiler/CubeValidator.js.map +1 -1
- package/dist/src/compiler/DataSchemaCompiler.d.ts +6 -2
- package/dist/src/compiler/DataSchemaCompiler.d.ts.map +1 -1
- package/dist/src/compiler/DataSchemaCompiler.js +27 -22
- package/dist/src/compiler/DataSchemaCompiler.js.map +1 -1
- package/package.json +6 -6
|
@@ -14,7 +14,7 @@ export declare class BaseFilter extends BaseDimension {
|
|
|
14
14
|
measureDefinition(): import("../compiler/CubeEvaluator").MeasureDefinition;
|
|
15
15
|
path(): any;
|
|
16
16
|
cube(): any;
|
|
17
|
-
definition(): import("../compiler/CubeEvaluator").
|
|
17
|
+
definition(): import("../compiler/CubeEvaluator").SegmentDefinition | import("../compiler/CubeEvaluator").MeasureDefinition;
|
|
18
18
|
escapeWildcardChars(param: any): any;
|
|
19
19
|
isWildcardOperator(): boolean;
|
|
20
20
|
filterParams(): any[];
|
|
@@ -188,6 +188,7 @@ export class BaseQuery {
|
|
|
188
188
|
allCubeMembers(path: any): string[];
|
|
189
189
|
getAllocatedParams(): unknown[];
|
|
190
190
|
generateTimeSeries(granularity: any, dateRange: any): import("@cubejs-backend/shared").QueryDateRange[];
|
|
191
|
+
generateCustomTimeSeries(granularityInterval: any, dateRange: any, origin: any): import("@cubejs-backend/shared").QueryDateRange[];
|
|
191
192
|
get shouldReuseParams(): boolean;
|
|
192
193
|
/**
|
|
193
194
|
* Returns a dictionary mapping each preagregation to its corresponding query fragment.
|
|
@@ -245,7 +246,7 @@ export class BaseQuery {
|
|
|
245
246
|
collectAllMultiStageMembers(allMemberChildren: any): {
|
|
246
247
|
[index: string]: any;
|
|
247
248
|
};
|
|
248
|
-
memberInstanceByPath(m: any):
|
|
249
|
+
memberInstanceByPath(m: any): BaseDimension | BaseSegment | BaseMeasure;
|
|
249
250
|
multiStageWithQueries(member: any, queryContext: any, memberChildren: any, withQueries: any): any;
|
|
250
251
|
collectUsedWithQueries(usedQueries: any, member: any): void;
|
|
251
252
|
childrenMultiStageContext(memberPath: any, queryContext: any, wouldNodeApplyFilters: any): any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/BaseQuery.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BaseQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/BaseQuery.js"],"names":[],"mappings":"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"}
|
|
@@ -10,23 +10,23 @@ exports.BaseQuery = void 0;
|
|
|
10
10
|
* @copyright Cube Dev, Inc.
|
|
11
11
|
* @license Apache-2.0
|
|
12
12
|
*/
|
|
13
|
-
const ramda_1 = __importDefault(require("ramda"));
|
|
14
13
|
const cron_parser_1 = __importDefault(require("cron-parser"));
|
|
15
|
-
const moment_timezone_1 = __importDefault(require("moment-timezone"));
|
|
16
14
|
const inflection_1 = __importDefault(require("inflection"));
|
|
17
|
-
const
|
|
15
|
+
const moment_timezone_1 = __importDefault(require("moment-timezone"));
|
|
16
|
+
const ramda_1 = __importDefault(require("ramda"));
|
|
18
17
|
const native_1 = require("@cubejs-backend/native");
|
|
18
|
+
const shared_1 = require("@cubejs-backend/shared");
|
|
19
19
|
const UserError_1 = require("../compiler/UserError");
|
|
20
|
-
const
|
|
20
|
+
const SqlParser_1 = require("../parser/SqlParser");
|
|
21
21
|
const BaseDimension_1 = require("./BaseDimension");
|
|
22
|
-
const BaseSegment_1 = require("./BaseSegment");
|
|
23
22
|
const BaseFilter_1 = require("./BaseFilter");
|
|
24
23
|
const BaseGroupFilter_1 = require("./BaseGroupFilter");
|
|
24
|
+
const BaseMeasure_1 = require("./BaseMeasure");
|
|
25
|
+
const BaseSegment_1 = require("./BaseSegment");
|
|
25
26
|
const BaseTimeDimension_1 = require("./BaseTimeDimension");
|
|
27
|
+
const Granularity_1 = require("./Granularity");
|
|
26
28
|
const ParamAllocator_1 = require("./ParamAllocator");
|
|
27
29
|
const PreAggregations_1 = require("./PreAggregations");
|
|
28
|
-
const SqlParser_1 = require("../parser/SqlParser");
|
|
29
|
-
const Granularity_1 = require("./Granularity");
|
|
30
30
|
const DEFAULT_PREAGGREGATIONS_SCHEMA = 'stb_pre_aggregations';
|
|
31
31
|
const standardGranularitiesParents = {
|
|
32
32
|
year: ['year', 'quarter', 'month', 'day', 'hour', 'minute', 'second'],
|
|
@@ -593,10 +593,14 @@ class BaseQuery {
|
|
|
593
593
|
getAllocatedParams() {
|
|
594
594
|
return this.paramAllocator.getParams();
|
|
595
595
|
}
|
|
596
|
-
// FIXME helper for native generator, maybe should be moved
|
|
596
|
+
// FIXME helper for native generator, maybe should be moved entirely to rust
|
|
597
597
|
generateTimeSeries(granularity, dateRange) {
|
|
598
598
|
return (0, shared_1.timeSeries)(granularity, dateRange);
|
|
599
599
|
}
|
|
600
|
+
// FIXME helper for native generator, maybe should be moved entirely to rust
|
|
601
|
+
generateCustomTimeSeries(granularityInterval, dateRange, origin) {
|
|
602
|
+
return (0, shared_1.timeSeriesFromCustomInterval)(granularityInterval, dateRange, (0, moment_timezone_1.default)(origin), { timestampPrecision: 3 });
|
|
603
|
+
}
|
|
600
604
|
get shouldReuseParams() {
|
|
601
605
|
return false;
|
|
602
606
|
}
|
|
@@ -2748,7 +2752,11 @@ class BaseQuery {
|
|
|
2748
2752
|
'(\'{{ time_item | join(\'\\\', \\\'\') }}\')' +
|
|
2749
2753
|
'{% if not loop.last %}, {% endif %}' +
|
|
2750
2754
|
'{% endfor %}' +
|
|
2751
|
-
') AS dates (date_from, date_to)'
|
|
2755
|
+
') AS dates (date_from, date_to)',
|
|
2756
|
+
time_series_get_range: 'SELECT {{ max_expr }} as {{ quoted_max_name }},\n' +
|
|
2757
|
+
'{{ min_expr }} as {{ quoted_min_name }}\n' +
|
|
2758
|
+
'FROM {{ from_prepared }}\n' +
|
|
2759
|
+
'{% if filter %}WHERE {{ filter }}{% endif %}'
|
|
2752
2760
|
},
|
|
2753
2761
|
expressions: {
|
|
2754
2762
|
column_reference: '{% if table_name %}{{ table_name }}.{% endif %}{{ name }}',
|