@lightdash/common 2.197.2 → 2.198.0
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/cjs/.tsbuildinfo +1 -1
- package/dist/cjs/compiler/exploreCompiler.d.ts.map +1 -1
- package/dist/cjs/compiler/exploreCompiler.js +7 -1
- package/dist/cjs/compiler/exploreCompiler.js.map +1 -1
- package/dist/cjs/compiler/exploreCompiler.test.js +45 -0
- package/dist/cjs/compiler/exploreCompiler.test.js.map +1 -1
- package/dist/cjs/compiler/joinInflation.d.ts +2 -1
- package/dist/cjs/compiler/joinInflation.d.ts.map +1 -1
- package/dist/cjs/compiler/joinInflation.js +12 -4
- package/dist/cjs/compiler/joinInflation.js.map +1 -1
- package/dist/cjs/compiler/joinInflation.test.d.ts +2 -0
- package/dist/cjs/compiler/joinInflation.test.d.ts.map +1 -0
- package/dist/cjs/compiler/joinInflation.test.js +30 -0
- package/dist/cjs/compiler/joinInflation.test.js.map +1 -0
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/compiler/exploreCompiler.d.ts.map +1 -1
- package/dist/esm/compiler/exploreCompiler.js +7 -1
- package/dist/esm/compiler/exploreCompiler.js.map +1 -1
- package/dist/esm/compiler/exploreCompiler.test.js +45 -0
- package/dist/esm/compiler/exploreCompiler.test.js.map +1 -1
- package/dist/esm/compiler/joinInflation.d.ts +2 -1
- package/dist/esm/compiler/joinInflation.d.ts.map +1 -1
- package/dist/esm/compiler/joinInflation.js +13 -5
- package/dist/esm/compiler/joinInflation.js.map +1 -1
- package/dist/esm/compiler/joinInflation.test.d.ts +2 -0
- package/dist/esm/compiler/joinInflation.test.d.ts.map +1 -0
- package/dist/esm/compiler/joinInflation.test.js +28 -0
- package/dist/esm/compiler/joinInflation.test.js.map +1 -0
- package/dist/types/.tsbuildinfo +1 -1
- package/dist/types/compiler/exploreCompiler.d.ts.map +1 -1
- package/dist/types/compiler/exploreCompiler.js +7 -1
- package/dist/types/compiler/exploreCompiler.js.map +1 -1
- package/dist/types/compiler/exploreCompiler.test.js +45 -0
- package/dist/types/compiler/exploreCompiler.test.js.map +1 -1
- package/dist/types/compiler/joinInflation.d.ts +2 -1
- package/dist/types/compiler/joinInflation.d.ts.map +1 -1
- package/dist/types/compiler/joinInflation.js +13 -5
- package/dist/types/compiler/joinInflation.js.map +1 -1
- package/dist/types/compiler/joinInflation.test.d.ts +2 -0
- package/dist/types/compiler/joinInflation.test.d.ts.map +1 -0
- package/dist/types/compiler/joinInflation.test.js +28 -0
- package/dist/types/compiler/joinInflation.test.js.map +1 -0
- package/package.json +1 -1
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.findTablesWithMetricInflation = exports.isInflationProofMetric = exports.getJoinedTables = void 0;
|
|
4
4
|
const lodash_1 = require("lodash");
|
|
5
|
+
const errors_1 = require("../types/errors");
|
|
5
6
|
const explore_1 = require("../types/explore");
|
|
6
7
|
const field_1 = require("../types/field");
|
|
7
8
|
const exploreCompiler_1 = require("./exploreCompiler");
|
|
@@ -88,10 +89,19 @@ const findChainedOneToOneTableJoins = ({ tables, possibleJoins, }) => {
|
|
|
88
89
|
findReferences(tables);
|
|
89
90
|
return result;
|
|
90
91
|
};
|
|
91
|
-
const findTablesWithMetricInflation = ({ baseTable, joinedTables, possibleJoins, tables, }) => {
|
|
92
|
+
const findTablesWithMetricInflation = ({ baseTable, joinedTables, possibleJoins, tables, warnings, }) => {
|
|
92
93
|
const tablesWithMetricInflation = new Set();
|
|
93
94
|
const joinWithoutRelationship = new Set();
|
|
94
95
|
const tablesWithoutPrimaryKey = new Set();
|
|
96
|
+
const missingJoin = [...joinedTables].find((table) => table !== baseTable &&
|
|
97
|
+
!possibleJoins.some((join) => join.table === table));
|
|
98
|
+
if (missingJoin) {
|
|
99
|
+
const joinWarnings = (warnings ?? []).filter(({ type }) => type === explore_1.InlineErrorType.MISSING_TABLE ||
|
|
100
|
+
type === explore_1.InlineErrorType.SKIPPED_JOIN);
|
|
101
|
+
throw new errors_1.CompileError(`Join "${missingJoin}" is not available for base table "${baseTable}". Check the model's compilation warnings and the project's tags/selector, then refresh the project.${joinWarnings.length > 0
|
|
102
|
+
? ` Join compilation warnings: ${joinWarnings.map(({ message }) => message).join(' ')}`
|
|
103
|
+
: ''}`);
|
|
104
|
+
}
|
|
95
105
|
// Check if any join has a many-to-many relationship
|
|
96
106
|
const hasManyToManyJoin = Array.from(joinedTables).some((joinedTable) => {
|
|
97
107
|
if (joinedTable === baseTable)
|
|
@@ -116,10 +126,8 @@ const findTablesWithMetricInflation = ({ baseTable, joinedTables, possibleJoins,
|
|
|
116
126
|
// skip base table
|
|
117
127
|
return;
|
|
118
128
|
}
|
|
129
|
+
// All query joins were validated above.
|
|
119
130
|
const join = possibleJoins.find((possibleJoin) => possibleJoin.table === joinedTable);
|
|
120
|
-
if (!join) {
|
|
121
|
-
throw new Error(`Join ${joinedTable} not found`);
|
|
122
|
-
}
|
|
123
131
|
if (!join.tablesReferences) {
|
|
124
132
|
// Skip, as we can't detect inflation without knowing table references in join SQL
|
|
125
133
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"joinInflation.js","sourceRoot":"","sources":["../../../src/compiler/joinInflation.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"joinInflation.js","sourceRoot":"","sources":["../../../src/compiler/joinInflation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"joinInflation.test.d.ts","sourceRoot":"","sources":["../../../src/compiler/joinInflation.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const errors_1 = require("../types/errors");
|
|
4
|
+
const explore_1 = require("../types/explore");
|
|
5
|
+
const joinInflation_1 = require("./joinInflation");
|
|
6
|
+
describe('findTablesWithMetricInflation', () => {
|
|
7
|
+
it.each([explore_1.JoinRelationship.ONE_TO_MANY, explore_1.JoinRelationship.MANY_TO_MANY])('rejects missing joins without cached warnings, even with a %s join', (relationship) => {
|
|
8
|
+
const analyze = () => (0, joinInflation_1.findTablesWithMetricInflation)({
|
|
9
|
+
baseTable: 'orders',
|
|
10
|
+
joinedTables: new Set(['orders', 'items', 'account']),
|
|
11
|
+
possibleJoins: [
|
|
12
|
+
{
|
|
13
|
+
table: 'items',
|
|
14
|
+
sqlOn: '',
|
|
15
|
+
compiledSqlOn: '',
|
|
16
|
+
relationship,
|
|
17
|
+
tablesReferences: ['orders', 'items'],
|
|
18
|
+
},
|
|
19
|
+
],
|
|
20
|
+
tables: {
|
|
21
|
+
orders: { primaryKey: ['id'] },
|
|
22
|
+
items: { primaryKey: ['id'] },
|
|
23
|
+
},
|
|
24
|
+
});
|
|
25
|
+
expect(analyze).toThrow(errors_1.CompileError);
|
|
26
|
+
expect(analyze).toThrow(/Join "account" is not available for base table "orders"/);
|
|
27
|
+
expect(analyze).toThrow(/compilation warnings.*tags\/selector/);
|
|
28
|
+
});
|
|
29
|
+
});
|
|
30
|
+
//# sourceMappingURL=joinInflation.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"joinInflation.test.js","sourceRoot":"","sources":["../../../src/compiler/joinInflation.test.ts"],"names":[],"mappings":";;AAAA,4CAA+C;AAC/C,8CAAoD;AACpD,mDAAgE;AAEhE,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;IAC3C,EAAE,CAAC,IAAI,CAAC,CAAC,0BAAgB,CAAC,WAAW,EAAE,0BAAgB,CAAC,YAAY,CAAC,CAAC,CAClE,oEAAoE,EACpE,CAAC,YAAY,EAAE,EAAE;QACb,MAAM,OAAO,GAAG,GAAG,EAAE,CACjB,IAAA,6CAA6B,EAAC;YAC1B,SAAS,EAAE,QAAQ;YACnB,YAAY,EAAE,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;YACrD,aAAa,EAAE;gBACX;oBACI,KAAK,EAAE,OAAO;oBACd,KAAK,EAAE,EAAE;oBACT,aAAa,EAAE,EAAE;oBACjB,YAAY;oBACZ,gBAAgB,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC;iBACxC;aACJ;YACD,MAAM,EAAE;gBACJ,MAAM,EAAE,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE;gBAC9B,KAAK,EAAE,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE;aAChC;SACJ,CAAC,CAAC;QAEP,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,qBAAY,CAAC,CAAC;QACtC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CACnB,yDAAyD,CAC5D,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAC;IACpE,CAAC,CACJ,CAAC;AACN,CAAC,CAAC,CAAC"}
|