@cubejs-backend/druid-driver 1.6.33 → 1.6.34

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.
@@ -28,6 +28,10 @@ export declare class DruidDriver extends BaseDriver {
28
28
  * Data source name.
29
29
  */
30
30
  dataSource?: string;
31
+ /**
32
+ * Whether this driver is used for pre-aggregations.
33
+ */
34
+ preAggregations?: boolean;
31
35
  /**
32
36
  * Max pool size value for the [cube]<-->[db] pool.
33
37
  */
@@ -1 +1 @@
1
- {"version":3,"file":"DruidDriver.d.ts","sourceRoot":"","sources":["../../src/DruidDriver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EACL,UAAU,EACV,2BAA2B,EAC3B,0BAA0B,EAC1B,gBAAgB,EACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,4BAA4B,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACpG,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,MAAM,wBAAwB,GAAG,4BAA4B,GAAG;IACpE,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,qBAAa,WAAY,SAAQ,UAAU;IACzC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,wBAAwB,CAAC;IAEpD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;WAEzB,YAAY;IAI1B;;OAEG;WACW,qBAAqB,IAAI,MAAM;IAI7C;;OAEG;gBAED,MAAM,GAAE,wBAAwB,GAAG;QACjC;;WAEG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;QAEpB;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB;;;WAGG;QACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;KAC3B;IAyCD,QAAQ;IAIF,cAAc;IAId,KAAK,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAKlF,sBAAsB;IAYhB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D,cAAc,CAAC,UAAU,EAAE,MAAM;IAMjC,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,2BAA2B,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAuB/I,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,OAAO,EAAE;;;;IAOhD,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG;CAGrC"}
1
+ {"version":3,"file":"DruidDriver.d.ts","sourceRoot":"","sources":["../../src/DruidDriver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EACL,UAAU,EACV,2BAA2B,EAC3B,0BAA0B,EAC1B,gBAAgB,EACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,4BAA4B,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACpG,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,MAAM,wBAAwB,GAAG,4BAA4B,GAAG;IACpE,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,qBAAa,WAAY,SAAQ,UAAU;IACzC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,wBAAwB,CAAC;IAEpD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;WAEzB,YAAY;IAI1B;;OAEG;WACW,qBAAqB,IAAI,MAAM;IAI7C;;OAEG;gBAED,MAAM,GAAE,wBAAwB,GAAG;QACjC;;WAEG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;QAEpB;;WAEG;QACH,eAAe,CAAC,EAAE,OAAO,CAAC;QAE1B;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB;;;WAGG;QACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;KAC3B;IA0CD,QAAQ;IAIF,cAAc;IAId,KAAK,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAKlF,sBAAsB;IAYhB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D,cAAc,CAAC,UAAU,EAAE,MAAM;IAMjC,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,2BAA2B,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAuB/I,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,OAAO,EAAE;;;;IAOhD,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG;CAGrC"}
@@ -34,12 +34,13 @@ class DruidDriver extends base_driver_1.BaseDriver {
34
34
  });
35
35
  const dataSource = config.dataSource ||
36
36
  (0, shared_1.assertDataSource)('default');
37
- let url = config.url || (0, shared_1.getEnv)('dbUrl', { dataSource });
37
+ const preAggregations = config.preAggregations || false;
38
+ let url = config.url || (0, shared_1.getEnv)('dbUrl', { dataSource, preAggregations });
38
39
  if (!url) {
39
- const host = (0, shared_1.getEnv)('dbHost', { dataSource });
40
- const port = (0, shared_1.getEnv)('dbPort', { dataSource });
40
+ const host = (0, shared_1.getEnv)('dbHost', { dataSource, preAggregations });
41
+ const port = (0, shared_1.getEnv)('dbPort', { dataSource, preAggregations });
41
42
  if (host && port) {
42
- const protocol = (0, shared_1.getEnv)('dbSsl', { dataSource })
43
+ const protocol = (0, shared_1.getEnv)('dbSsl', { dataSource, preAggregations })
43
44
  ? 'https'
44
45
  : 'http';
45
46
  url = `${protocol}://${host}:${port}`;
@@ -51,11 +52,11 @@ class DruidDriver extends base_driver_1.BaseDriver {
51
52
  this.config = {
52
53
  url,
53
54
  user: config.user ||
54
- (0, shared_1.getEnv)('dbUser', { dataSource }),
55
+ (0, shared_1.getEnv)('dbUser', { dataSource, preAggregations }),
55
56
  password: config.password ||
56
- (0, shared_1.getEnv)('dbPass', { dataSource }),
57
+ (0, shared_1.getEnv)('dbPass', { dataSource, preAggregations }),
57
58
  database: config.database ||
58
- (0, shared_1.getEnv)('dbName', { dataSource }) ||
59
+ (0, shared_1.getEnv)('dbName', { dataSource, preAggregations }) ||
59
60
  'default',
60
61
  ...config,
61
62
  };
@@ -1 +1 @@
1
- {"version":3,"file":"DruidDriver.js","sourceRoot":"","sources":["../../src/DruidDriver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DruidDriver.js","sourceRoot":"","sources":["../../src/DruidDriver.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@cubejs-backend/druid-driver",
3
3
  "description": "Cube.js Druid database driver",
4
4
  "author": "Cube Dev, Inc.",
5
- "version": "1.6.33",
5
+ "version": "1.6.34",
6
6
  "license": "Apache-2.0",
7
7
  "repository": {
8
8
  "type": "git",
@@ -28,13 +28,13 @@
28
28
  "dist/src/*"
29
29
  ],
30
30
  "dependencies": {
31
- "@cubejs-backend/base-driver": "1.6.33",
32
- "@cubejs-backend/schema-compiler": "1.6.33",
33
- "@cubejs-backend/shared": "1.6.33",
31
+ "@cubejs-backend/base-driver": "1.6.34",
32
+ "@cubejs-backend/schema-compiler": "1.6.34",
33
+ "@cubejs-backend/shared": "1.6.34",
34
34
  "axios": "^1.8.3"
35
35
  },
36
36
  "devDependencies": {
37
- "@cubejs-backend/linter": "1.6.33",
37
+ "@cubejs-backend/linter": "1.6.34",
38
38
  "@types/jest": "^29",
39
39
  "@types/node": "^20",
40
40
  "jest": "^29",
@@ -47,5 +47,5 @@
47
47
  "eslintConfig": {
48
48
  "extends": "../cubejs-linter"
49
49
  },
50
- "gitHead": "cec71d6fcd0aa1864d9e8039fbfc8ec50c136f7b"
50
+ "gitHead": "0db9e700b727993b5afe74e5b34686ae76b3cd89"
51
51
  }