@cubejs-backend/dbt-schema-extension 0.29.30 → 0.29.31
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/CHANGELOG.md +11 -0
- package/dist/src/Dbt.d.ts.map +1 -1
- package/dist/src/Dbt.js +4 -2
- package/dist/src/Dbt.js.map +1 -1
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [0.29.31](https://github.com/cube-js/cube.js/compare/v0.29.30...v0.29.31) (2022-03-09)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **@cubejs-backend/dbt-schema-extension:** Identifiers are not properly escaped in case for Dbt cloud ([be28d61](https://github.com/cube-js/cube.js/commit/be28d61f09b3de8e1960e46646f88c85ece4bf56))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [0.29.30](https://github.com/cube-js/cube.js/compare/v0.29.29...v0.29.30) (2022-03-04)
|
|
7
18
|
|
|
8
19
|
**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
|
package/dist/src/Dbt.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dbt.d.ts","sourceRoot":"","sources":["../../src/Dbt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAa,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"Dbt.d.ts","sourceRoot":"","sources":["../../src/Dbt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAa,MAAM,iCAAiC,CAAC;AAuC/E,aAAK,cAAc,GAAG;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAqEF,qBAAa,GAAI,SAAQ,iBAAiB;IAC3B,6BAA6B,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAyBjH,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAuClJ,OAAO,CAAC,qCAAqC;CAwE9C"}
|
package/dist/src/Dbt.js
CHANGED
|
@@ -98,7 +98,9 @@ class Dbt extends schema_compiler_1.AbstractExtension {
|
|
|
98
98
|
})).reduce((a, b) => ({ ...a, ...b }), {}),
|
|
99
99
|
nodes: res.data.models.map(modelDef => ({
|
|
100
100
|
[modelDef.uniqueId]: {
|
|
101
|
-
|
|
101
|
+
database: modelDef.database,
|
|
102
|
+
schema: modelDef.schema,
|
|
103
|
+
name: modelDef.name,
|
|
102
104
|
}
|
|
103
105
|
})).reduce((a, b) => ({ ...a, ...b }), {}),
|
|
104
106
|
};
|
|
@@ -136,7 +138,7 @@ class Dbt extends schema_compiler_1.AbstractExtension {
|
|
|
136
138
|
throw new schema_compiler_1.UserError(`Model '${model}' is not found`);
|
|
137
139
|
}
|
|
138
140
|
const cubeDef = {
|
|
139
|
-
sql: () => `SELECT * FROM ${modelDef.relation_name}`,
|
|
141
|
+
sql: () => `SELECT * FROM ${modelDef.relation_name ? modelDef.relation_name : `${this.compiler.contextQuery().escapeColumnName(modelDef.database)}.${this.compiler.contextQuery().escapeColumnName(modelDef.schema)}.${this.compiler.contextQuery().escapeColumnName(modelDef.name)}`}`,
|
|
140
142
|
fileName: manifestPath,
|
|
141
143
|
measures: cubeDefs[model].metrics.map(metric => ({
|
|
142
144
|
[inflection_1.camelize(metric.name, true)]: {
|
package/dist/src/Dbt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dbt.js","sourceRoot":"","sources":["../../src/Dbt.ts"],"names":[],"mappings":";;;;;;AAAA,qEAA+E;AAC/E,2CAAsC;AACtC,wDAA0B;AAC1B,gDAAwB;AACxB,4DAA+B;
|
|
1
|
+
{"version":3,"file":"Dbt.js","sourceRoot":"","sources":["../../src/Dbt.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/dbt-schema-extension",
|
|
3
3
|
"description": "Cube.js dbt Schema Extension",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "0.29.
|
|
5
|
+
"version": "0.29.31",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.js.git",
|
|
@@ -25,14 +25,14 @@
|
|
|
25
25
|
"lint:fix": "eslint --fix src/* --ext .ts,.js"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@cubejs-backend/schema-compiler": "^0.29.
|
|
28
|
+
"@cubejs-backend/schema-compiler": "^0.29.31",
|
|
29
29
|
"fs-extra": "^9.1.0",
|
|
30
30
|
"inflection": "^1.12.0",
|
|
31
31
|
"node-fetch": "^2.6.1"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@cubejs-backend/linter": "^0.29.23",
|
|
35
|
-
"@cubejs-backend/testing": "^0.29.
|
|
35
|
+
"@cubejs-backend/testing": "^0.29.31",
|
|
36
36
|
"@types/generic-pool": "^3.1.9",
|
|
37
37
|
"@types/jest": "^26.0.24",
|
|
38
38
|
"jest": "^26.6.3",
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"publishConfig": {
|
|
51
51
|
"access": "public"
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "a5c6aff18e30bd1d085cde84f9cb5d0db24030e8"
|
|
54
54
|
}
|