@cubejs-backend/schema-compiler 0.35.0 → 0.35.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.
Files changed (8) hide show
  1. package/dist/src/scaffolding/ScaffoldingSchema.d.ts +2 -0
  2. package/dist/src/scaffolding/ScaffoldingSchema.d.ts.map +1 -1
  3. package/dist/src/scaffolding/ScaffoldingSchema.js.map +1 -1
  4. package/dist/src/scaffolding/formatters/BaseSchemaFormatter.d.ts +2 -16
  5. package/dist/src/scaffolding/formatters/BaseSchemaFormatter.d.ts.map +1 -1
  6. package/dist/src/scaffolding/formatters/BaseSchemaFormatter.js +68 -19
  7. package/dist/src/scaffolding/formatters/BaseSchemaFormatter.js.map +1 -1
  8. package/package.json +5 -5
package/dist/src/scaffolding/ScaffoldingSchema.d.ts CHANGED
@@ -41,6 +41,7 @@ export type CubeDescriptor = {
41
41
  schema: string;
42
42
  members: CubeDescriptorMember[];
43
43
  joins: Join[];
44
+ shouldGeneratePrimaryKey?: boolean;
44
45
  };
45
46
  export type TableSchema = {
46
47
  cube: string;
@@ -51,6 +52,7 @@ export type TableSchema = {
51
52
  dimensions: Dimension[];
52
53
  drillMembers?: Dimension[];
53
54
  joins: Join[];
55
+ compositePrimaryKey?: any[];
54
56
  };
55
57
  export type DatabaseSchema = Record<string, Record<string, any>>;
56
58
  type ScaffoldingSchemaOptions = {
package/dist/src/scaffolding/ScaffoldingSchema.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ScaffoldingSchema.d.ts","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingSchema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ScaffoldingSchema.d.ts","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingSchema.ts"],"names":[],"mappings":"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"}
package/dist/src/scaffolding/ScaffoldingSchema.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ScaffoldingSchema.js","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingSchema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ScaffoldingSchema.js","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingSchema.ts"],"names":[],"mappings":"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"}
package/dist/src/scaffolding/formatters/BaseSchemaFormatter.d.ts CHANGED
@@ -31,14 +31,7 @@ export declare abstract class BaseSchemaFormatter {
31
31
  relationship: string;
32
32
  };
33
33
  };
34
- dimensions: {
35
- [x: string]: {
36
- [x: string]: any;
37
- sql: string;
38
- type: any;
39
- title: any;
40
- };
41
- };
34
+ dimensions: any;
42
35
  measures: {
43
36
  count: {
44
37
  type: string;
@@ -54,14 +47,7 @@ export declare abstract class BaseSchemaFormatter {
54
47
  relationship: string;
55
48
  };
56
49
  };
57
- dimensions: {
58
- [x: string]: {
59
- [x: string]: any;
60
- sql: string;
61
- type: any;
62
- title: any;
63
- };
64
- };
50
+ dimensions: any;
65
51
  measures: {
66
52
  count: {
67
53
  type: string;
package/dist/src/scaffolding/formatters/BaseSchemaFormatter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BaseSchemaFormatter.d.ts","sourceRoot":"","sources":["../../../../src/scaffolding/formatters/BaseSchemaFormatter.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EACL,cAAc,EACd,cAAc,EAEd,iBAAiB,EACjB,SAAS,EACT,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAU9B,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AAEF,8BAAsB,mBAAmB;IAInC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,cAAc;IAC3C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG;IAC9B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,sBAAsB;IALtD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;gBAGjC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,sBAAsB;aAKtC,aAAa,IAAI,MAAM;IAEvC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAEtD,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM;IAEvE,yBAAyB,CAC9B,UAAU,EAAE,SAAS,EAAE,EACvB,aAAa,GAAE,aAAkB,GAChC,UAAU,EAAE;IAWR,8BAA8B,CACnC,eAAe,EAAE,cAAc,EAAE,EACjC,aAAa,GAAE,aAAkB,GAChC,UAAU,EAAE;IAOf,SAAS,CAAC,YAAY,CAAC,CAAC,KAAA;IAQxB,SAAS,CAAC,WAAW,CAAC,CAAC,KAAA;IAMvB,SAAS,CAAC,UAAU,CAAC,MAAM,KAAA;IAU3B,SAAS,CAAC,UAAU,CAAC,IAAI,KAAA;IAOzB,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM;IAIlC,wBAAwB,CAAC,WAAW,EAAE,WAAW,EAAE,aAAa,GAAE,aAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAmF3F,SAAS,CAAC,gCAAgC,CAAC,eAAe,EAAE,cAAc,EAAE;CAiC7E"}
1
+ {"version":3,"file":"BaseSchemaFormatter.d.ts","sourceRoot":"","sources":["../../../../src/scaffolding/formatters/BaseSchemaFormatter.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EACL,cAAc,EAEd,cAAc,EAEd,iBAAiB,EACjB,SAAS,EACT,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAU9B,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AAEF,8BAAsB,mBAAmB;IAIrC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,cAAc;IAC3C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG;IAC9B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,sBAAsB;IALpD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;gBAGnC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,sBAAsB;aAKpC,aAAa,IAAI,MAAM;IAEvC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAEtD,SAAS,CAAC,QAAQ,CAAC,UAAU,CAC3B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACtC,MAAM;IAEF,yBAAyB,CAC9B,UAAU,EAAE,SAAS,EAAE,EACvB,aAAa,GAAE,aAAkB,GAChC,UAAU,EAAE;IAaR,8BAA8B,CACnC,eAAe,EAAE,cAAc,EAAE,EACjC,aAAa,GAAE,aAAkB,GAChC,UAAU,EAAE;IAWf,SAAS,CAAC,YAAY,CAAC,CAAC,KAAA;IAQxB,SAAS,CAAC,WAAW,CAAC,CAAC,KAAA;IAOvB,SAAS,CAAC,UAAU,CAAC,MAAM,KAAA;IAU3B,SAAS,CAAC,UAAU,CAAC,IAAI,KAAA;IAOzB,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM;IAIlC,wBAAwB,CAC7B,WAAW,EAAE,WAAW,EACxB,aAAa,GAAE,aAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA+GnC,SAAS,CAAC,gCAAgC,CACxC,eAAe,EAAE,cAAc,EAAE;CAwCpC"}
package/dist/src/scaffolding/formatters/BaseSchemaFormatter.js CHANGED
@@ -1,10 +1,30 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
4
24
  };
5
25
  Object.defineProperty(exports, "__esModule", { value: true });
6
26
  exports.BaseSchemaFormatter = void 0;
7
- const inflection_1 = __importDefault(require("inflection"));
27
+ const inflection_1 = __importStar(require("inflection"));
8
28
  const ScaffoldingSchema_1 = require("../ScaffoldingSchema");
9
29
  const ValueWithComments_1 = require("../descriptors/ValueWithComments");
10
30
  const utils_1 = require("../utils");
@@ -39,7 +59,8 @@ class BaseSchemaFormatter {
39
59
  : ''}${this.escapeName(m.name)}`;
40
60
  }
41
61
  memberTitle(m) {
42
- return inflection_1.default.titleize(inflection_1.default.underscore(this.memberName(m))) !== m.title
62
+ return inflection_1.default.titleize(inflection_1.default.underscore(this.memberName(m))) !==
63
+ m.title
43
64
  ? m.title
44
65
  : undefined;
45
66
  }
@@ -60,14 +81,18 @@ class BaseSchemaFormatter {
60
81
  return !!name.match(/^[a-z0-9_]+$/i);
61
82
  }
62
83
  schemaDescriptorForTable(tableSchema, schemaContext = {}) {
63
- let table = `${tableSchema.schema?.length ? `${this.escapeName(tableSchema.schema)}.` : ''}${this.escapeName(tableSchema.table)}`;
84
+ let table = `${tableSchema.schema?.length
85
+ ? `${this.escapeName(tableSchema.schema)}.`
86
+ : ''}${this.escapeName(tableSchema.table)}`;
64
87
  if (this.options.catalog) {
65
88
  table = `${this.escapeName(this.options.catalog)}.${table}`;
66
89
  }
67
90
  const { dataSource, ...contextProps } = schemaContext;
68
91
  let dataSourceProp = {};
69
92
  if (dataSource) {
70
- dataSourceProp = this.options.snakeCase ? { data_source: dataSource } : { dataSource };
93
+ dataSourceProp = this.options.snakeCase
94
+ ? { data_source: dataSource }
95
+ : { dataSource };
71
96
  }
72
97
  const sqlOption = this.options.snakeCase
73
98
  ? {
@@ -76,6 +101,20 @@ class BaseSchemaFormatter {
76
101
  : {
77
102
  sql: `SELECT * FROM ${table}`,
78
103
  };
104
+ let compositePrimaryKey;
105
+ if (tableSchema.compositePrimaryKey) {
106
+ const { length } = tableSchema.compositePrimaryKey;
107
+ const name = tableSchema.dimensions.find(d => d.name === 'id') ? 'generated_composite_primary_key' : 'id';
108
+ compositePrimaryKey = {
109
+ [name]: {
110
+ name,
111
+ title: (0, inflection_1.titleize)(name),
112
+ sql: this.driver.concatStringsSql(tableSchema.compositePrimaryKey
113
+ .flatMap((it, index) => [`${this.cubeReference('CUBE')}.${this.escapeName(it.name)}`, index !== length - 1 ? '\'-\'' : null].filter(Boolean))),
114
+ [this.options.snakeCase ? 'primary_key' : 'primaryKey']: true
115
+ }
116
+ };
117
+ }
79
118
  return {
80
119
  cube: tableSchema.cube,
81
120
  ...sqlOption,
@@ -90,18 +129,20 @@ class BaseSchemaFormatter {
90
129
  },
91
130
  }))
92
131
  .reduce((a, b) => ({ ...a, ...b }), {}),
93
- dimensions: tableSchema.dimensions.sort((a) => (a.isPrimaryKey ? -1 : 0))
94
- .map((m) => ({
95
- [this.memberName(m)]: {
96
- sql: this.sqlForMember(m),
97
- type: m.type ?? m.types[0],
98
- title: this.memberTitle(m),
99
- [this.options.snakeCase ? 'primary_key' : 'primaryKey']: m.isPrimaryKey
100
- ? true
101
- : undefined,
102
- },
103
- }))
104
- .reduce((a, b) => ({ ...a, ...b }), {}),
132
+ dimensions: {
133
+ ...compositePrimaryKey,
134
+ ...tableSchema.dimensions
135
+ .sort((a) => (a.isPrimaryKey ? -1 : 0))
136
+ .map((m) => ({
137
+ [this.memberName(m)]: {
138
+ sql: this.sqlForMember(m),
139
+ type: m.type ?? m.types[0],
140
+ title: this.memberTitle(m),
141
+ [this.options.snakeCase ? 'primary_key' : 'primaryKey']: m.isPrimaryKey ? true : undefined,
142
+ },
143
+ }))
144
+ .reduce((a, b) => ({ ...a, ...b }), {})
145
+ },
105
146
  measures: tableSchema.measures
106
147
  .map((m) => ({
107
148
  [this.memberName(m)]: {
@@ -116,7 +157,10 @@ class BaseSchemaFormatter {
116
157
  },
117
158
  }),
118
159
  ...(this.options.snakeCase
119
- ? Object.fromEntries(Object.entries(contextProps).map(([key, value]) => [(0, utils_1.toSnakeCase)(key), value]))
160
+ ? Object.fromEntries(Object.entries(contextProps).map(([key, value]) => [
161
+ (0, utils_1.toSnakeCase)(key),
162
+ value,
163
+ ]))
120
164
  : contextProps),
121
165
  [this.options.snakeCase ? 'pre_aggregations' : 'preAggregations']: new ValueWithComments_1.ValueWithComments(null, [
122
166
  'Pre-aggregation definitions go here.',
@@ -136,10 +180,15 @@ class BaseSchemaFormatter {
136
180
  measures: [],
137
181
  dimensions: [],
138
182
  });
183
+ let compositePrimaryKey = [];
184
+ if (descriptor.shouldGeneratePrimaryKey) {
185
+ compositePrimaryKey = cubeMembers.dimensions.filter(d => !d.isPrimaryKey && d.type !== 'time');
186
+ }
139
187
  return {
140
188
  ...generatedDescriptor,
141
189
  ...descriptor,
142
190
  ...cubeMembers,
191
+ compositePrimaryKey
143
192
  };
144
193
  });
145
194
  }
package/dist/src/scaffolding/formatters/BaseSchemaFormatter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BaseSchemaFormatter.js","sourceRoot":"","sources":["../../../../src/scaffolding/formatters/BaseSchemaFormatter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BaseSchemaFormatter.js","sourceRoot":"","sources":["../../../../src/scaffolding/formatters/BaseSchemaFormatter.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@cubejs-backend/schema-compiler",
3
3
  "description": "Cube schema compiler",
4
4
  "author": "Cube Dev, Inc.",
5
- "version": "0.35.0",
5
+ "version": "0.35.1",
6
6
  "repository": {
7
7
  "type": "git",
8
8
  "url": "https://github.com/cube-js/cube.git",
@@ -40,7 +40,7 @@
40
40
  "@babel/standalone": "^7.12.10",
41
41
  "@babel/traverse": "^7.12.10",
42
42
  "@babel/types": "^7.12.12",
43
- "@cubejs-backend/native": "^0.35.0",
43
+ "@cubejs-backend/native": "^0.35.1",
44
44
  "@cubejs-backend/shared": "^0.35.0",
45
45
  "antlr4ts": "0.5.0-alpha.4",
46
46
  "camelcase": "^6.2.0",
@@ -60,7 +60,7 @@
60
60
  "devDependencies": {
61
61
  "@cubejs-backend/apla-clickhouse": "^1.7.0",
62
62
  "@cubejs-backend/linter": "^0.35.0",
63
- "@cubejs-backend/query-orchestrator": "^0.35.0",
63
+ "@cubejs-backend/query-orchestrator": "^0.35.1",
64
64
  "@types/babel__code-frame": "^7.0.2",
65
65
  "@types/babel__generator": "^7.6.2",
66
66
  "@types/babel__parser": "^7.1.1",
@@ -75,7 +75,7 @@
75
75
  "@types/uuid": "^8.3.0",
76
76
  "antlr4ts-cli": "^0.5.0-alpha.4",
77
77
  "jest": "^27",
78
- "mssql": "^6.1.0",
78
+ "mssql": "^10.0.2",
79
79
  "mysql": "^2.18.1",
80
80
  "pg-promise": "^10.5.2",
81
81
  "request": "^2.88.0",
@@ -103,5 +103,5 @@
103
103
  ],
104
104
  "globalSetup": "<rootDir>/dist/test/global-setup.js"
105
105
  },
106
- "gitHead": "75bc6c3d96392b7823e714d17ac85ab435e55b05"
106
+ "gitHead": "344f0f1dd10a79351c154783d6d796c85ef5f2e2"
107
107
  }