@lightdash/common 0.2018.0 → 0.2018.1
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/dbt/DbtSchemaEditor/DbtSchemaEditor.d.ts +4 -1
- package/dist/cjs/dbt/DbtSchemaEditor/DbtSchemaEditor.d.ts.map +1 -1
- package/dist/cjs/dbt/DbtSchemaEditor/DbtSchemaEditor.js +43 -8
- package/dist/cjs/dbt/DbtSchemaEditor/DbtSchemaEditor.js.map +1 -1
- package/dist/cjs/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.d.ts +1 -0
- package/dist/cjs/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.d.ts.map +1 -1
- package/dist/cjs/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.js +7 -1
- package/dist/cjs/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.js.map +1 -1
- package/dist/cjs/dbt/DbtSchemaEditor/DbtSchemaEditor.test.js +89 -0
- package/dist/cjs/dbt/DbtSchemaEditor/DbtSchemaEditor.test.js.map +1 -1
- package/dist/cjs/types/scheduler.d.ts +1 -0
- package/dist/cjs/types/scheduler.d.ts.map +1 -1
- package/dist/esm/dbt/DbtSchemaEditor/DbtSchemaEditor.d.ts +4 -1
- package/dist/esm/dbt/DbtSchemaEditor/DbtSchemaEditor.d.ts.map +1 -1
- package/dist/esm/dbt/DbtSchemaEditor/DbtSchemaEditor.js +43 -8
- package/dist/esm/dbt/DbtSchemaEditor/DbtSchemaEditor.js.map +1 -1
- package/dist/esm/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.d.ts +1 -0
- package/dist/esm/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.d.ts.map +1 -1
- package/dist/esm/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.js +6 -0
- package/dist/esm/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.js.map +1 -1
- package/dist/esm/dbt/DbtSchemaEditor/DbtSchemaEditor.test.js +90 -1
- package/dist/esm/dbt/DbtSchemaEditor/DbtSchemaEditor.test.js.map +1 -1
- package/dist/esm/types/scheduler.d.ts +1 -0
- package/dist/esm/types/scheduler.d.ts.map +1 -1
- package/dist/tsconfig.types.tsbuildinfo +1 -1
- package/dist/types/dbt/DbtSchemaEditor/DbtSchemaEditor.d.ts +4 -1
- package/dist/types/dbt/DbtSchemaEditor/DbtSchemaEditor.d.ts.map +1 -1
- package/dist/types/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.d.ts +1 -0
- package/dist/types/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.d.ts.map +1 -1
- package/dist/types/types/scheduler.d.ts +1 -0
- package/dist/types/types/scheduler.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -2,6 +2,7 @@ import { type YAMLMap } from 'yaml';
|
|
|
2
2
|
import { type DeepPartialNullable } from '../../types/deepPartial';
|
|
3
3
|
import { type CustomDimension } from '../../types/field';
|
|
4
4
|
import { type AdditionalMetric } from '../../types/metricQuery';
|
|
5
|
+
import { SupportedDbtVersions } from '../../types/projects';
|
|
5
6
|
import { type WarehouseClient } from '../../types/warehouse';
|
|
6
7
|
import { type YamlColumn, type YamlModel } from '../../types/yamlSchema';
|
|
7
8
|
/**
|
|
@@ -13,7 +14,9 @@ import { type YamlColumn, type YamlModel } from '../../types/yamlSchema';
|
|
|
13
14
|
*/
|
|
14
15
|
export default class DbtSchemaEditor {
|
|
15
16
|
private readonly doc;
|
|
16
|
-
|
|
17
|
+
private readonly dbtVersion?;
|
|
18
|
+
constructor(doc?: string, filename?: string, dbtVersion?: SupportedDbtVersions);
|
|
19
|
+
isDbtVersion110OrHigher(): boolean;
|
|
17
20
|
findModelByName(name: string): YAMLMap<unknown, unknown> | undefined;
|
|
18
21
|
getModelByName(name: string): YAMLMap<unknown, unknown>;
|
|
19
22
|
findColumnByName(modelName: string, columnName: string): YAMLMap<unknown, unknown> | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DbtSchemaEditor.d.ts","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.ts"],"names":[],"mappings":"AAEA,OAAO,EAOH,KAAK,OAAO,EACf,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAIH,KAAK,eAAe,EAEvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EACH,KAAK,eAAe,EAEvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACH,KAAK,UAAU,EACf,KAAK,SAAS,EAEjB,MAAM,wBAAwB,CAAC;AAOhC;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAW;
|
|
1
|
+
{"version":3,"file":"DbtSchemaEditor.d.ts","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.ts"],"names":[],"mappings":"AAEA,OAAO,EAOH,KAAK,OAAO,EACf,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAIH,KAAK,eAAe,EAEvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EACH,KAAK,eAAe,EAEvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACH,KAAK,UAAU,EACf,KAAK,SAAS,EAEjB,MAAM,wBAAwB,CAAC;AAOhC;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAW;IAE/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAuB;gBAG/C,GAAG,GAAE,MAAW,EAChB,QAAQ,GAAE,MAAW,EACrB,UAAU,CAAC,EAAE,oBAAoB;IAuBrC,uBAAuB,IAAI,OAAO;IAalC,eAAe,CAAC,IAAI,EAAE,MAAM;IAY5B,cAAc,CAAC,IAAI,EAAE,MAAM;IAQ3B,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAiBtD,OAAO,CAAC,8BAA8B;IAUtC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAUrD,SAAS;IAKT,eAAe,CAAC,SAAS,EAAE,MAAM;IAgBjC,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,eAAe;IAY3C,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,eAAe;IAuBjE,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,eAAe;IAkBxE,gBAAgB,CAAC,kBAAkB,EAAE,gBAAgB,EAAE,GAAG,eAAe;IAiCzE,mBAAmB,CACf,qBAAqB,EAAE,eAAe,EAAE,EACxC,eAAe,EAAE,eAAe,GACjC,eAAe;IAOlB,kBAAkB,CACd,eAAe,EAAE,eAAe,EAChC,eAAe,EAAE,eAAe,GACjC,eAAe;IASlB,OAAO,CAAC,qBAAqB;IAkD7B,OAAO,CAAC,qBAAqB;IAuD7B;;;;;;;;;;;;;;;OAeG;IACH,YAAY,CAAC,EACT,SAAS,EACT,UAAU,EACV,UAAe,GAClB,EAAE;QACC,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,mBAAmB,CAAC,UAAU,CAAC,CAAC;KAChD;IA0BD,QAAQ,CAAC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,GAAG,GAAG,GAAG,CAAA;KAAE,GAAG,MAAM;IAgBrD,IAAI,IAAI,MAAM;CAGjB"}
|
|
@@ -8,6 +8,7 @@ const exploreCompiler_1 = require("../../compiler/exploreCompiler");
|
|
|
8
8
|
const lightdash_dbt_2_0_json_1 = tslib_1.__importDefault(require("../../schemas/json/lightdash-dbt-2.0.json"));
|
|
9
9
|
const errors_1 = require("../../types/errors");
|
|
10
10
|
const field_1 = require("../../types/field");
|
|
11
|
+
const projects_1 = require("../../types/projects");
|
|
11
12
|
const convertCustomDimensionsToYaml_1 = require("../../utils/convertCustomDimensionsToYaml");
|
|
12
13
|
const convertCustomMetricsToYaml_1 = require("../../utils/convertCustomMetricsToYaml");
|
|
13
14
|
/**
|
|
@@ -18,8 +19,9 @@ const convertCustomMetricsToYaml_1 = require("../../utils/convertCustomMetricsTo
|
|
|
18
19
|
* const updatedSchema = editor.addCustomMetrics(customMetricsToAdd).toString();
|
|
19
20
|
*/
|
|
20
21
|
class DbtSchemaEditor {
|
|
21
|
-
constructor(doc = '', filename = '') {
|
|
22
|
+
constructor(doc = '', filename = '', dbtVersion) {
|
|
22
23
|
this.doc = (0, yaml_1.parseDocument)(doc);
|
|
24
|
+
this.dbtVersion = dbtVersion;
|
|
23
25
|
const ajvCompiler = new ajv_1.default({
|
|
24
26
|
coerceTypes: true,
|
|
25
27
|
allowUnionTypes: true,
|
|
@@ -31,6 +33,17 @@ class DbtSchemaEditor {
|
|
|
31
33
|
throw new errors_1.ParseError(`Invalid schema file: ${filename}\n${errors}`);
|
|
32
34
|
}
|
|
33
35
|
}
|
|
36
|
+
isDbtVersion110OrHigher() {
|
|
37
|
+
if (!this.dbtVersion) {
|
|
38
|
+
return false;
|
|
39
|
+
}
|
|
40
|
+
// Get all enum values as an array in order
|
|
41
|
+
const versions = Object.values(projects_1.SupportedDbtVersions);
|
|
42
|
+
const v110Index = versions.indexOf(projects_1.SupportedDbtVersions.V1_10);
|
|
43
|
+
const currentIndex = versions.indexOf(this.dbtVersion);
|
|
44
|
+
// If the current version is at or after v1.10 in the enum order
|
|
45
|
+
return currentIndex >= v110Index;
|
|
46
|
+
}
|
|
34
47
|
findModelByName(name) {
|
|
35
48
|
const node = this.doc.get('models');
|
|
36
49
|
if (!(0, yaml_1.isSeq)(node)) {
|
|
@@ -144,7 +157,13 @@ class DbtSchemaEditor {
|
|
|
144
157
|
if (!column) {
|
|
145
158
|
throw new Error(`Column ${metric.baseDimensionName} not found in model ${metric.table}`);
|
|
146
159
|
}
|
|
147
|
-
|
|
160
|
+
// For dbt >= 1.10, meta should be inside config
|
|
161
|
+
if (this.isDbtVersion110OrHigher()) {
|
|
162
|
+
column.setIn(['config', 'meta', 'metrics', metric.name], (0, convertCustomMetricsToYaml_1.convertCustomMetricToDbt)(metric));
|
|
163
|
+
}
|
|
164
|
+
else {
|
|
165
|
+
column.setIn(['meta', 'metrics', metric.name], (0, convertCustomMetricsToYaml_1.convertCustomMetricToDbt)(metric));
|
|
166
|
+
}
|
|
148
167
|
});
|
|
149
168
|
return this;
|
|
150
169
|
}
|
|
@@ -177,11 +196,21 @@ class DbtSchemaEditor {
|
|
|
177
196
|
if ((0, yaml_1.isScalar)(columnSql) && typeof columnSql.value === 'string') {
|
|
178
197
|
baseDimensionSql = columnSql.value;
|
|
179
198
|
}
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
199
|
+
// For dbt >= 1.10, meta should be inside config
|
|
200
|
+
if (this.isDbtVersion110OrHigher()) {
|
|
201
|
+
column.setIn(['config', 'meta', 'additional_dimensions', customDimension.id], (0, convertCustomDimensionsToYaml_1.convertCustomBinDimensionToDbt)({
|
|
202
|
+
customDimension,
|
|
203
|
+
baseDimensionSql,
|
|
204
|
+
warehouseSqlBuilder,
|
|
205
|
+
}));
|
|
206
|
+
}
|
|
207
|
+
else {
|
|
208
|
+
column.setIn(['meta', 'additional_dimensions', customDimension.id], (0, convertCustomDimensionsToYaml_1.convertCustomBinDimensionToDbt)({
|
|
209
|
+
customDimension,
|
|
210
|
+
baseDimensionSql,
|
|
211
|
+
warehouseSqlBuilder,
|
|
212
|
+
}));
|
|
213
|
+
}
|
|
185
214
|
return this;
|
|
186
215
|
}
|
|
187
216
|
addCustomSqlDimension(customDimension) {
|
|
@@ -202,7 +231,13 @@ class DbtSchemaEditor {
|
|
|
202
231
|
if (!column) {
|
|
203
232
|
throw new Error(`Column ${firstRefFromSameTable} not found in model ${customDimension.table}`);
|
|
204
233
|
}
|
|
205
|
-
|
|
234
|
+
// For dbt >= 1.10, meta should be inside config
|
|
235
|
+
if (this.isDbtVersion110OrHigher()) {
|
|
236
|
+
column.setIn(['config', 'meta', 'additional_dimensions', customDimension.id], additionalDimension);
|
|
237
|
+
}
|
|
238
|
+
else {
|
|
239
|
+
column.setIn(['meta', 'additional_dimensions', customDimension.id], additionalDimension);
|
|
240
|
+
}
|
|
206
241
|
return this;
|
|
207
242
|
}
|
|
208
243
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DbtSchemaEditor.js","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.ts"],"names":[],"mappings":";;;AAAA,sDAAsB;AACtB,kFAAgD;AAChD,+BAQc;AACd,oEAAoE;AACpE,+GAA+E;AAE/E,+CAAgD;AAChD,6CAM2B;
|
|
1
|
+
{"version":3,"file":"DbtSchemaEditor.js","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ export declare const SCHEMA_JSON: {
|
|
|
22
22
|
}[];
|
|
23
23
|
}[];
|
|
24
24
|
};
|
|
25
|
+
export declare const SIMPLE_SCHEMA = "version: 2\nmodels:\n - name: test_table\n columns:\n - name: test_column\n description: A test column";
|
|
25
26
|
export declare const INVALID_SCHEMA_YML = "\nversion: 2\nmodels:\n - label: table_a\n";
|
|
26
27
|
export declare const CUSTOM_METRIC: AdditionalMetric;
|
|
27
28
|
export declare const CUSTOM_SQL_DIMENSION: CustomSqlDimension;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DbtSchemaEditor.mock.d.ts","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,KAAK,kBAAkB,EAEvB,KAAK,kBAAkB,EACvB,aAAa,EAEhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,eAAO,MAAM,UAAU,yrBA8BtB,CAAC;AAEF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;CA4CvB,CAAC;
|
|
1
|
+
{"version":3,"file":"DbtSchemaEditor.mock.d.ts","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,KAAK,kBAAkB,EAEvB,KAAK,kBAAkB,EACvB,aAAa,EAEhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,eAAO,MAAM,UAAU,yrBA8BtB,CAAC;AAEF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;CA4CvB,CAAC;AAEF,eAAO,MAAM,aAAa,2HAKS,CAAC;AAGpC,eAAO,MAAM,kBAAkB,+CAI9B,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,gBAO3B,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,kBAOlC,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,kBAQvC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,kBAiBxC,CAAC;AAGF,eAAO,MAAM,mDAAmD,iqDAyD/D,CAAC;AAEF,eAAO,MAAM,SAAS;;;;;;;;;;;;;;CAgBrB,CAAC;AAEF,eAAO,MAAM,mCAAmC;;;;;;;;;;;;;;;;CAE/C,CAAC;AAEF,eAAO,MAAM,kCAAkC,qNAU9C,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.EXPECTED_SCHEMA_YML_WITH_NEW_MODEL = exports.EXPECTED_SCHEMA_JSON_WITH_NEW_MODEL = exports.NEW_MODEL = exports.EXPECTED_SCHEMA_YML_WITH_NEW_METRICS_AND_DIMENSIONS = exports.CUSTOM_RANGE_BIN_DIMENSION = exports.FIXED_WIDTH_BIN_DIMENSION = exports.CUSTOM_SQL_DIMENSION = exports.CUSTOM_METRIC = exports.INVALID_SCHEMA_YML = exports.SCHEMA_JSON = exports.SCHEMA_YML = void 0;
|
|
3
|
+
exports.EXPECTED_SCHEMA_YML_WITH_NEW_MODEL = exports.EXPECTED_SCHEMA_JSON_WITH_NEW_MODEL = exports.NEW_MODEL = exports.EXPECTED_SCHEMA_YML_WITH_NEW_METRICS_AND_DIMENSIONS = exports.CUSTOM_RANGE_BIN_DIMENSION = exports.FIXED_WIDTH_BIN_DIMENSION = exports.CUSTOM_SQL_DIMENSION = exports.CUSTOM_METRIC = exports.INVALID_SCHEMA_YML = exports.SIMPLE_SCHEMA = exports.SCHEMA_JSON = exports.SCHEMA_YML = void 0;
|
|
4
4
|
// Mock schema file with comments, different multi-line strings, different types of quotes, different types of arrays
|
|
5
5
|
const field_1 = require("../../types/field");
|
|
6
6
|
exports.SCHEMA_YML = `# comment at the top
|
|
@@ -79,6 +79,12 @@ exports.SCHEMA_JSON = {
|
|
|
79
79
|
},
|
|
80
80
|
],
|
|
81
81
|
};
|
|
82
|
+
exports.SIMPLE_SCHEMA = `version: 2
|
|
83
|
+
models:
|
|
84
|
+
- name: test_table
|
|
85
|
+
columns:
|
|
86
|
+
- name: test_column
|
|
87
|
+
description: A test column`;
|
|
82
88
|
// invalid schema: models require a `name` field
|
|
83
89
|
exports.INVALID_SCHEMA_YML = `
|
|
84
90
|
version: 2
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DbtSchemaEditor.mock.js","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.ts"],"names":[],"mappings":";;;AAAA,qHAAqH;AACrH,6CAO2B;AAGd,QAAA,UAAU,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BzB,CAAC;AAEW,QAAA,WAAW,GAAG;IACvB,OAAO,EAAE,CAAC;IACV,MAAM,EAAE;QACJ;YACI,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,mDAAmD;YAChE,OAAO,EAAE;gBACL;oBACI,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC;oBAC7B,IAAI,EAAE;wBACF,OAAO,EAAE;4BACL,QAAQ,EAAE;gCACN,IAAI,EAAE,gBAAgB;6BACzB;4BACD,QAAQ,EAAE;gCACN,IAAI,EAAE,KAAK;6BACd;yBACJ;qBACJ;iBACJ;aACJ;SACJ;QACD;YACI,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,gDAAgD;YAC7D,OAAO,EAAE;gBACL;oBACI,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC;oBAC7B,IAAI,EAAE;wBACF,OAAO,EAAE;4BACL,QAAQ,EAAE;gCACN,IAAI,EAAE,gBAAgB;6BACzB;4BACD,QAAQ,EAAE;gCACN,IAAI,EAAE,KAAK;6BACd;yBACJ;qBACJ;iBACJ;aACJ;SACJ;KACJ;CACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"DbtSchemaEditor.mock.js","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const exploreCompiler_mock_1 = require("../../compiler/exploreCompiler.mock");
|
|
5
5
|
const errors_1 = require("../../types/errors");
|
|
6
|
+
const field_1 = require("../../types/field");
|
|
7
|
+
const projects_1 = require("../../types/projects");
|
|
6
8
|
const DbtSchemaEditor_1 = tslib_1.__importDefault(require("./DbtSchemaEditor"));
|
|
7
9
|
const DbtSchemaEditor_mock_1 = require("./DbtSchemaEditor.mock");
|
|
8
10
|
describe('DbtSchemaEditor', () => {
|
|
@@ -40,4 +42,91 @@ describe('DbtSchemaEditor', () => {
|
|
|
40
42
|
expect(editor.toString()).toEqual(DbtSchemaEditor_mock_1.EXPECTED_SCHEMA_YML_WITH_NEW_MODEL);
|
|
41
43
|
});
|
|
42
44
|
});
|
|
45
|
+
describe('dbt v1.10+ compatibility', () => {
|
|
46
|
+
it('should add custom metrics under config.meta for dbt v1.10', () => {
|
|
47
|
+
const editor = new DbtSchemaEditor_1.default(DbtSchemaEditor_mock_1.SIMPLE_SCHEMA, '', projects_1.SupportedDbtVersions.V1_10);
|
|
48
|
+
editor.addCustomMetrics([
|
|
49
|
+
{
|
|
50
|
+
name: 'test_metric',
|
|
51
|
+
description: 'Test metric',
|
|
52
|
+
sql: 'COUNT(*)',
|
|
53
|
+
type: field_1.MetricType.COUNT,
|
|
54
|
+
table: 'test_table',
|
|
55
|
+
baseDimensionName: 'test_column',
|
|
56
|
+
},
|
|
57
|
+
]);
|
|
58
|
+
const result = editor.toString().replace(/\s+/g, '');
|
|
59
|
+
// Check that the structure is config->meta->metrics (no spaces)
|
|
60
|
+
expect(result).toContain('config:meta:metrics:');
|
|
61
|
+
// Ensure meta is not directly at column level
|
|
62
|
+
expect(result).not.toContain('description:Atestcolumnmeta:');
|
|
63
|
+
});
|
|
64
|
+
it('should add custom metrics directly under meta for dbt v1.9', () => {
|
|
65
|
+
const editor = new DbtSchemaEditor_1.default(DbtSchemaEditor_mock_1.SIMPLE_SCHEMA, '', projects_1.SupportedDbtVersions.V1_9);
|
|
66
|
+
editor.addCustomMetrics([
|
|
67
|
+
{
|
|
68
|
+
name: 'test_metric',
|
|
69
|
+
description: 'Test metric',
|
|
70
|
+
sql: 'COUNT(*)',
|
|
71
|
+
type: field_1.MetricType.COUNT,
|
|
72
|
+
table: 'test_table',
|
|
73
|
+
baseDimensionName: 'test_column',
|
|
74
|
+
},
|
|
75
|
+
]);
|
|
76
|
+
const result = editor.toString().replace(/\s+/g, '');
|
|
77
|
+
// Check that meta is NOT inside config
|
|
78
|
+
expect(result).not.toContain('config:meta:metrics:');
|
|
79
|
+
// Check that meta is directly at column level
|
|
80
|
+
expect(result).toContain('description:Atestcolumnmeta:metrics:');
|
|
81
|
+
});
|
|
82
|
+
it('should add custom dimensions under config.meta for dbt v1.10', () => {
|
|
83
|
+
const editor = new DbtSchemaEditor_1.default(DbtSchemaEditor_mock_1.SIMPLE_SCHEMA, '', projects_1.SupportedDbtVersions.V1_10);
|
|
84
|
+
editor.addCustomDimensions([
|
|
85
|
+
{
|
|
86
|
+
id: 'custom_dim',
|
|
87
|
+
name: 'Custom Dimension',
|
|
88
|
+
table: 'test_table',
|
|
89
|
+
type: field_1.CustomDimensionType.SQL,
|
|
90
|
+
sql: '${test_table.test_column} || "_suffix"',
|
|
91
|
+
dimensionType: field_1.DimensionType.STRING,
|
|
92
|
+
},
|
|
93
|
+
], exploreCompiler_mock_1.warehouseClientMock);
|
|
94
|
+
const result = editor.toString().replace(/\s+/g, '');
|
|
95
|
+
// Check that the structure is config->meta->additional_dimensions (no spaces)
|
|
96
|
+
expect(result).toContain('config:meta:additional_dimensions:');
|
|
97
|
+
// Ensure meta is not directly at column level
|
|
98
|
+
expect(result).not.toContain('description:Atestcolumnmeta:');
|
|
99
|
+
});
|
|
100
|
+
it('should add custom dimensions directly under meta for dbt v1.9', () => {
|
|
101
|
+
const editor = new DbtSchemaEditor_1.default(DbtSchemaEditor_mock_1.SIMPLE_SCHEMA, '', projects_1.SupportedDbtVersions.V1_9);
|
|
102
|
+
editor.addCustomDimensions([
|
|
103
|
+
{
|
|
104
|
+
id: 'custom_dim',
|
|
105
|
+
name: 'Custom Dimension',
|
|
106
|
+
table: 'test_table',
|
|
107
|
+
type: field_1.CustomDimensionType.SQL,
|
|
108
|
+
sql: '${test_table.test_column} || "_suffix"',
|
|
109
|
+
dimensionType: field_1.DimensionType.STRING,
|
|
110
|
+
},
|
|
111
|
+
], exploreCompiler_mock_1.warehouseClientMock);
|
|
112
|
+
const result = editor.toString().replace(/\s+/g, '');
|
|
113
|
+
// Check that meta is NOT inside config
|
|
114
|
+
expect(result).not.toContain('config:meta:additional_dimensions:');
|
|
115
|
+
// Check that meta is directly at column level
|
|
116
|
+
expect(result).toContain('description:Atestcolumnmeta:additional_dimensions:');
|
|
117
|
+
});
|
|
118
|
+
it('should handle dbt versions correctly in isDbtVersion110OrHigher', () => {
|
|
119
|
+
// Test v1.9 and below
|
|
120
|
+
const editorV19 = new DbtSchemaEditor_1.default('version: 2', '', projects_1.SupportedDbtVersions.V1_9);
|
|
121
|
+
expect(editorV19.isDbtVersion110OrHigher()).toBe(false);
|
|
122
|
+
const editorV18 = new DbtSchemaEditor_1.default('version: 2', '', projects_1.SupportedDbtVersions.V1_8);
|
|
123
|
+
expect(editorV18.isDbtVersion110OrHigher()).toBe(false);
|
|
124
|
+
// Test v1.10
|
|
125
|
+
const editorV110 = new DbtSchemaEditor_1.default('version: 2', '', projects_1.SupportedDbtVersions.V1_10);
|
|
126
|
+
expect(editorV110.isDbtVersion110OrHigher()).toBe(true);
|
|
127
|
+
// Test undefined version (defaults to false)
|
|
128
|
+
const editorNoVersion = new DbtSchemaEditor_1.default('version: 2', '');
|
|
129
|
+
expect(editorNoVersion.isDbtVersion110OrHigher()).toBe(false);
|
|
130
|
+
});
|
|
131
|
+
});
|
|
43
132
|
//# sourceMappingURL=DbtSchemaEditor.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DbtSchemaEditor.test.js","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.test.ts"],"names":[],"mappings":";;;AAAA,8EAA0E;AAC1E,+CAAgD;AAChD,gFAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"DbtSchemaEditor.test.js","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -276,6 +276,7 @@ export type ValidateProjectPayload = TraceTaskBase & {
|
|
|
276
276
|
context: 'lightdash_app' | 'dbt_refresh' | 'test_and_compile' | 'cli';
|
|
277
277
|
explores?: (Explore | ExploreError)[];
|
|
278
278
|
validationTargets?: ValidationTarget[];
|
|
279
|
+
onlyValidateExploresInArgs?: boolean;
|
|
279
280
|
};
|
|
280
281
|
export type ApiJobScheduledResponse = {
|
|
281
282
|
status: 'ok';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../../src/types/scheduler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../../src/types/scheduler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { type YAMLMap } from 'yaml';
|
|
|
2
2
|
import { type DeepPartialNullable } from '../../types/deepPartial';
|
|
3
3
|
import { type CustomDimension } from '../../types/field';
|
|
4
4
|
import { type AdditionalMetric } from '../../types/metricQuery';
|
|
5
|
+
import { SupportedDbtVersions } from '../../types/projects';
|
|
5
6
|
import { type WarehouseClient } from '../../types/warehouse';
|
|
6
7
|
import { type YamlColumn, type YamlModel } from '../../types/yamlSchema';
|
|
7
8
|
/**
|
|
@@ -13,7 +14,9 @@ import { type YamlColumn, type YamlModel } from '../../types/yamlSchema';
|
|
|
13
14
|
*/
|
|
14
15
|
export default class DbtSchemaEditor {
|
|
15
16
|
private readonly doc;
|
|
16
|
-
|
|
17
|
+
private readonly dbtVersion?;
|
|
18
|
+
constructor(doc?: string, filename?: string, dbtVersion?: SupportedDbtVersions);
|
|
19
|
+
isDbtVersion110OrHigher(): boolean;
|
|
17
20
|
findModelByName(name: string): YAMLMap<unknown, unknown> | undefined;
|
|
18
21
|
getModelByName(name: string): YAMLMap<unknown, unknown>;
|
|
19
22
|
findColumnByName(modelName: string, columnName: string): YAMLMap<unknown, unknown> | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DbtSchemaEditor.d.ts","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.ts"],"names":[],"mappings":"AAEA,OAAO,EAOH,KAAK,OAAO,EACf,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAIH,KAAK,eAAe,EAEvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EACH,KAAK,eAAe,EAEvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACH,KAAK,UAAU,EACf,KAAK,SAAS,EAEjB,MAAM,wBAAwB,CAAC;AAOhC;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAW;
|
|
1
|
+
{"version":3,"file":"DbtSchemaEditor.d.ts","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.ts"],"names":[],"mappings":"AAEA,OAAO,EAOH,KAAK,OAAO,EACf,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAIH,KAAK,eAAe,EAEvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EACH,KAAK,eAAe,EAEvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACH,KAAK,UAAU,EACf,KAAK,SAAS,EAEjB,MAAM,wBAAwB,CAAC;AAOhC;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAW;IAE/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAuB;gBAG/C,GAAG,GAAE,MAAW,EAChB,QAAQ,GAAE,MAAW,EACrB,UAAU,CAAC,EAAE,oBAAoB;IAuBrC,uBAAuB,IAAI,OAAO;IAalC,eAAe,CAAC,IAAI,EAAE,MAAM;IAY5B,cAAc,CAAC,IAAI,EAAE,MAAM;IAQ3B,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAiBtD,OAAO,CAAC,8BAA8B;IAUtC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAUrD,SAAS;IAKT,eAAe,CAAC,SAAS,EAAE,MAAM;IAgBjC,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,eAAe;IAY3C,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,eAAe;IAuBjE,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,eAAe;IAkBxE,gBAAgB,CAAC,kBAAkB,EAAE,gBAAgB,EAAE,GAAG,eAAe;IAiCzE,mBAAmB,CACf,qBAAqB,EAAE,eAAe,EAAE,EACxC,eAAe,EAAE,eAAe,GACjC,eAAe;IAOlB,kBAAkB,CACd,eAAe,EAAE,eAAe,EAChC,eAAe,EAAE,eAAe,GACjC,eAAe;IASlB,OAAO,CAAC,qBAAqB;IAkD7B,OAAO,CAAC,qBAAqB;IAuD7B;;;;;;;;;;;;;;;OAeG;IACH,YAAY,CAAC,EACT,SAAS,EACT,UAAU,EACV,UAAe,GAClB,EAAE;QACC,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,mBAAmB,CAAC,UAAU,CAAC,CAAC;KAChD;IA0BD,QAAQ,CAAC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,GAAG,GAAG,GAAG,CAAA;KAAE,GAAG,MAAM;IAgBrD,IAAI,IAAI,MAAM;CAGjB"}
|
|
@@ -5,6 +5,7 @@ import { parseAllReferences } from '../../compiler/exploreCompiler';
|
|
|
5
5
|
import lightdashDbtYamlSchema from '../../schemas/json/lightdash-dbt-2.0.json';
|
|
6
6
|
import { ParseError } from '../../types/errors';
|
|
7
7
|
import { defaultSql, isCustomSqlDimension, } from '../../types/field';
|
|
8
|
+
import { SupportedDbtVersions } from '../../types/projects';
|
|
8
9
|
import { convertCustomBinDimensionToDbt, convertCustomSqlDimensionToDbt, } from '../../utils/convertCustomDimensionsToYaml';
|
|
9
10
|
import { convertCustomMetricToDbt } from '../../utils/convertCustomMetricsToYaml';
|
|
10
11
|
/**
|
|
@@ -15,8 +16,9 @@ import { convertCustomMetricToDbt } from '../../utils/convertCustomMetricsToYaml
|
|
|
15
16
|
* const updatedSchema = editor.addCustomMetrics(customMetricsToAdd).toString();
|
|
16
17
|
*/
|
|
17
18
|
export default class DbtSchemaEditor {
|
|
18
|
-
constructor(doc = '', filename = '') {
|
|
19
|
+
constructor(doc = '', filename = '', dbtVersion) {
|
|
19
20
|
this.doc = parseDocument(doc);
|
|
21
|
+
this.dbtVersion = dbtVersion;
|
|
20
22
|
const ajvCompiler = new Ajv({
|
|
21
23
|
coerceTypes: true,
|
|
22
24
|
allowUnionTypes: true,
|
|
@@ -28,6 +30,17 @@ export default class DbtSchemaEditor {
|
|
|
28
30
|
throw new ParseError(`Invalid schema file: ${filename}\n${errors}`);
|
|
29
31
|
}
|
|
30
32
|
}
|
|
33
|
+
isDbtVersion110OrHigher() {
|
|
34
|
+
if (!this.dbtVersion) {
|
|
35
|
+
return false;
|
|
36
|
+
}
|
|
37
|
+
// Get all enum values as an array in order
|
|
38
|
+
const versions = Object.values(SupportedDbtVersions);
|
|
39
|
+
const v110Index = versions.indexOf(SupportedDbtVersions.V1_10);
|
|
40
|
+
const currentIndex = versions.indexOf(this.dbtVersion);
|
|
41
|
+
// If the current version is at or after v1.10 in the enum order
|
|
42
|
+
return currentIndex >= v110Index;
|
|
43
|
+
}
|
|
31
44
|
findModelByName(name) {
|
|
32
45
|
const node = this.doc.get('models');
|
|
33
46
|
if (!isSeq(node)) {
|
|
@@ -141,7 +154,13 @@ export default class DbtSchemaEditor {
|
|
|
141
154
|
if (!column) {
|
|
142
155
|
throw new Error(`Column ${metric.baseDimensionName} not found in model ${metric.table}`);
|
|
143
156
|
}
|
|
144
|
-
|
|
157
|
+
// For dbt >= 1.10, meta should be inside config
|
|
158
|
+
if (this.isDbtVersion110OrHigher()) {
|
|
159
|
+
column.setIn(['config', 'meta', 'metrics', metric.name], convertCustomMetricToDbt(metric));
|
|
160
|
+
}
|
|
161
|
+
else {
|
|
162
|
+
column.setIn(['meta', 'metrics', metric.name], convertCustomMetricToDbt(metric));
|
|
163
|
+
}
|
|
145
164
|
});
|
|
146
165
|
return this;
|
|
147
166
|
}
|
|
@@ -174,11 +193,21 @@ export default class DbtSchemaEditor {
|
|
|
174
193
|
if (isScalar(columnSql) && typeof columnSql.value === 'string') {
|
|
175
194
|
baseDimensionSql = columnSql.value;
|
|
176
195
|
}
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
196
|
+
// For dbt >= 1.10, meta should be inside config
|
|
197
|
+
if (this.isDbtVersion110OrHigher()) {
|
|
198
|
+
column.setIn(['config', 'meta', 'additional_dimensions', customDimension.id], convertCustomBinDimensionToDbt({
|
|
199
|
+
customDimension,
|
|
200
|
+
baseDimensionSql,
|
|
201
|
+
warehouseSqlBuilder,
|
|
202
|
+
}));
|
|
203
|
+
}
|
|
204
|
+
else {
|
|
205
|
+
column.setIn(['meta', 'additional_dimensions', customDimension.id], convertCustomBinDimensionToDbt({
|
|
206
|
+
customDimension,
|
|
207
|
+
baseDimensionSql,
|
|
208
|
+
warehouseSqlBuilder,
|
|
209
|
+
}));
|
|
210
|
+
}
|
|
182
211
|
return this;
|
|
183
212
|
}
|
|
184
213
|
addCustomSqlDimension(customDimension) {
|
|
@@ -199,7 +228,13 @@ export default class DbtSchemaEditor {
|
|
|
199
228
|
if (!column) {
|
|
200
229
|
throw new Error(`Column ${firstRefFromSameTable} not found in model ${customDimension.table}`);
|
|
201
230
|
}
|
|
202
|
-
|
|
231
|
+
// For dbt >= 1.10, meta should be inside config
|
|
232
|
+
if (this.isDbtVersion110OrHigher()) {
|
|
233
|
+
column.setIn(['config', 'meta', 'additional_dimensions', customDimension.id], additionalDimension);
|
|
234
|
+
}
|
|
235
|
+
else {
|
|
236
|
+
column.setIn(['meta', 'additional_dimensions', customDimension.id], additionalDimension);
|
|
237
|
+
}
|
|
203
238
|
return this;
|
|
204
239
|
}
|
|
205
240
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DbtSchemaEditor.js","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,EACH,KAAK,EACL,QAAQ,EACR,KAAK,EACL,aAAa,EACb,OAAO,GAGV,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,sBAAsB,MAAM,2CAA2C,CAAC;AAE/E,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EACH,UAAU,EACV,oBAAoB,GAIvB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"DbtSchemaEditor.js","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ export declare const SCHEMA_JSON: {
|
|
|
22
22
|
}[];
|
|
23
23
|
}[];
|
|
24
24
|
};
|
|
25
|
+
export declare const SIMPLE_SCHEMA = "version: 2\nmodels:\n - name: test_table\n columns:\n - name: test_column\n description: A test column";
|
|
25
26
|
export declare const INVALID_SCHEMA_YML = "\nversion: 2\nmodels:\n - label: table_a\n";
|
|
26
27
|
export declare const CUSTOM_METRIC: AdditionalMetric;
|
|
27
28
|
export declare const CUSTOM_SQL_DIMENSION: CustomSqlDimension;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DbtSchemaEditor.mock.d.ts","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,KAAK,kBAAkB,EAEvB,KAAK,kBAAkB,EACvB,aAAa,EAEhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,eAAO,MAAM,UAAU,yrBA8BtB,CAAC;AAEF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;CA4CvB,CAAC;
|
|
1
|
+
{"version":3,"file":"DbtSchemaEditor.mock.d.ts","sourceRoot":"","sources":["../../../../src/dbt/DbtSchemaEditor/DbtSchemaEditor.mock.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,KAAK,kBAAkB,EAEvB,KAAK,kBAAkB,EACvB,aAAa,EAEhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,eAAO,MAAM,UAAU,yrBA8BtB,CAAC;AAEF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;CA4CvB,CAAC;AAEF,eAAO,MAAM,aAAa,2HAKS,CAAC;AAGpC,eAAO,MAAM,kBAAkB,+CAI9B,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,gBAO3B,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,kBAOlC,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,kBAQvC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,kBAiBxC,CAAC;AAGF,eAAO,MAAM,mDAAmD,iqDAyD/D,CAAC;AAEF,eAAO,MAAM,SAAS;;;;;;;;;;;;;;CAgBrB,CAAC;AAEF,eAAO,MAAM,mCAAmC;;;;;;;;;;;;;;;;CAE/C,CAAC;AAEF,eAAO,MAAM,kCAAkC,qNAU9C,CAAC"}
|
|
@@ -76,6 +76,12 @@ export const SCHEMA_JSON = {
|
|
|
76
76
|
},
|
|
77
77
|
],
|
|
78
78
|
};
|
|
79
|
+
export const SIMPLE_SCHEMA = `version: 2
|
|
80
|
+
models:
|
|
81
|
+
- name: test_table
|
|
82
|
+
columns:
|
|
83
|
+
- name: test_column
|
|
84
|
+
description: A test column`;
|
|
79
85
|
// invalid schema: models require a `name` field
|
|
80
86
|
export const INVALID_SCHEMA_YML = `
|
|
81
87
|
version: 2
|