@cubejs-backend/dremio-driver 0.30.75 → 0.31.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
+
+
+### Features
+
+* multiple data source ([#5326](https://github.com/cube-js/cube.js/issues/5326)) ([334af8c](https://github.com/cube-js/cube.js/commit/334af8c56cd02ae551844e9d1e9ab5e107fb1555))
+
+
+
+
+
 ## [0.30.75](https://github.com/cube-js/cube.js/compare/v0.30.74...v0.30.75) (2022-09-22)
 
 **Note:** Version bump only for package @cubejs-backend/dremio-driver

package/driver/DremioDriver.js

@@ -1,7 +1,7 @@
 const axios = require('axios');
 const SqlString = require('sqlstring');
 const { BaseDriver } = require('@cubejs-backend/base-driver');
-const { getEnv, pausePromise } = require('@cubejs-backend/shared');
+const { getEnv, assertDataSource, pausePromise } = require('@cubejs-backend/shared');
 
 const DremioQuery = require('./DremioQuery');
 
@@ -11,6 +11,9 @@ const DREMIO_JOB_LIMIT = 500;
 
 const applyParams = (query, params) => SqlString.format(query, params);
 
+/**
+ * Dremio driver class.
+ */
 class DremioDriver extends BaseDriver {
   static dialectClass() {
     return DremioQuery;
@@ -18,29 +21,59 @@ class DremioDriver extends BaseDriver {
 
   /**
    * Returns default concurrency value.
+   * @return {number}
    */
   static getDefaultConcurrency() {
     return 2;
   }
 
+  /**
+   * Class constructor.
+   */
   constructor(config = {}) {
     super();
 
+    const dataSource =
+      config.dataSource ||
+      assertDataSource('default');
+
     this.config = {
-      host: config.host || process.env.CUBEJS_DB_HOST || 'localhost',
-      port: config.port || process.env.CUBEJS_DB_PORT || 9047,
-      user: config.user || process.env.CUBEJS_DB_USER,
-      password: config.password || process.env.CUBEJS_DB_PASS,
-      database: config.database || process.env.CUBEJS_DB_NAME,
-      ssl: config.ssl || process.env.CUBEJS_DB_SSL,
+      host:
+        config.host ||
+        getEnv('dbHost', { dataSource }) ||
+        'localhost',
+      port:
+        config.port ||
+        getEnv('dbPort', { dataSource }) ||
+        9047,
+      user:
+        config.user ||
+        getEnv('dbUser', { dataSource }),
+      password:
+        config.password ||
+        getEnv('dbPass', { dataSource }),
+      database:
+        config.database ||
+        getEnv('dbName', { dataSource }),
+      ssl:
+        config.ssl ||
+        getEnv('dbSsl', { dataSource }),
       ...config,
-      pollTimeout: (config.pollTimeout || getEnv('dbPollTimeout') || getEnv('dbQueryTimeout')) * 1000,
-      pollMaxInterval: (config.pollMaxInterval || getEnv('dbPollMaxInterval')) * 1000,
+      pollTimeout: (
+        config.pollTimeout ||
+        getEnv('dbPollTimeout', { dataSource }) ||
+        getEnv('dbQueryTimeout', { dataSource })
+      ) * 1000,
+      pollMaxInterval: (
+        config.pollMaxInterval ||
+        getEnv('dbPollMaxInterval', { dataSource })
+      ) * 1000,
     };
-
-    const protocol = (this.config.ssl === true || this.config.ssl === 'true') ? 'https' : 'http';
-
-    this.config.url = `${protocol}://${this.config.host}:${this.config.port}`;
+    const protocol = (this.config.ssl === true || this.config.ssl === 'true')
+      ? 'https'
+      : 'http';
+    this.config.url =
+      `${protocol}://${this.config.host}:${this.config.port}`;
   }
 
   /**

package/package.json

@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/dremio-driver",
   "description": "Cube.js Dremio driver",
   "author": "Cube Dev, Inc.",
-  "version": "0.30.75",
+  "version": "0.31.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.js.git",
@@ -17,15 +17,15 @@
     "lint:fix": "eslint driver/*.js"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "^0.30.73",
-    "@cubejs-backend/schema-compiler": "^0.30.75",
-    "@cubejs-backend/shared": "^0.30.69",
+    "@cubejs-backend/base-driver": "^0.31.0",
+    "@cubejs-backend/schema-compiler": "^0.31.0",
+    "@cubejs-backend/shared": "^0.31.0",
     "axios": "^0.21.1",
     "moment-timezone": "^0.5.31",
     "sqlstring": "^2.3.1"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^0.30.0",
+    "@cubejs-backend/linter": "^0.31.0",
     "jest": "^26.6.3"
   },
   "license": "Apache-2.0",
@@ -35,5 +35,5 @@
   "eslintConfig": {
     "extends": "../cubejs-linter"
   },
-  "gitHead": "ae78a8d80115a61b688bba55ffcab5454d929616"
+  "gitHead": "8cdec759f298fb20c48194254ccc04b6fdad46bf"
 }