@cubejs-backend/mssql-driver 0.30.73 → 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.73](https://github.com/cube-js/cube.js/compare/v0.30.72...v0.30.73) (2022-09-19)
 
 **Note:** Version bump only for package @cubejs-backend/mssql-driver

package/driver/MSSqlDriver.js

@@ -1,5 +1,9 @@
 const sql = require('mssql');
 const { BaseDriver } = require('@cubejs-backend/base-driver');
+import {
+  getEnv,
+  assertDataSource,
+} from '@cubejs-backend/shared';
 
 const GenericTypeToMSSql = {
   string: 'nvarchar(max)',
@@ -13,6 +17,9 @@ const MSSqlToGenericType = {
   datetime2: 'timestamp'
 }
 
+/**
+ * MS SQL driver class.
+ */
 class MSSqlDriver extends BaseDriver {
   /**
    * Returns default concurrency value.
@@ -21,23 +28,33 @@ class MSSqlDriver extends BaseDriver {
     return 2;
   }
 
+  /**
+   * Class constructor.
+   */
   constructor(config = {}) {
     super();
+    
+    const dataSource =
+      config.dataSource ||
+      assertDataSource('default');
+  
     this.config = {
-      server: process.env.CUBEJS_DB_HOST,
-      database: process.env.CUBEJS_DB_NAME,
-      port: process.env.CUBEJS_DB_PORT && parseInt(process.env.CUBEJS_DB_PORT, 10),
-      user: process.env.CUBEJS_DB_USER,
-      password: process.env.CUBEJS_DB_PASS,
-      domain: process.env.CUBEJS_DB_DOMAIN && process.env.CUBEJS_DB_DOMAIN.trim().length > 0 ?
-        process.env.CUBEJS_DB_DOMAIN : undefined,
+      server: getEnv('dbHost', { dataSource }),
+      database: getEnv('dbName', { dataSource }),
+      port: getEnv('dbPort', { dataSource }),
+      user: getEnv('dbUser', { dataSource }),
+      password: getEnv('dbPass', { dataSource }),
+      domain: getEnv('dbDomain', { dataSource }),
       requestTimeout: 10 * 60 * 1000, // 10 minutes
       options: {
-        encrypt: process.env.CUBEJS_DB_SSL === 'true',
+        encrypt: getEnv('dbSsl', { dataSource }),
         useUTC: false
       },
       pool: {
-        max: config.maxPoolSize || 8,
+        max:
+          config.maxPoolSize ||
+          getEnv('dbMaxPoolSize', { dataSource }) ||
+          8,
         min: 0,
         evictionRunIntervalMillis: 10000,
         softIdleTimeoutMillis: 30000,
@@ -52,6 +69,8 @@ class MSSqlDriver extends BaseDriver {
   }
 
   static driverEnvVariables() {
+    // TODO (buntarb): check how this method can/must be used with split
+    // names by the data source.
     return [
       'CUBEJS_DB_HOST', 'CUBEJS_DB_NAME', 'CUBEJS_DB_PORT', 'CUBEJS_DB_USER', 'CUBEJS_DB_PASS', 'CUBEJS_DB_DOMAIN'
     ];

package/package.json

@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/mssql-driver",
   "description": "Cube.js MS SQL database driver",
   "author": "Cube Dev, Inc.",
-  "version": "0.30.73",
+  "version": "0.31.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.js.git",
@@ -13,12 +13,12 @@
   },
   "main": "driver/MSSqlDriver.js",
   "dependencies": {
-    "@cubejs-backend/base-driver": "^0.30.73",
+    "@cubejs-backend/base-driver": "^0.31.0",
     "mssql": "^6.1.0"
   },
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d47987e8eab041fd9b5113feb3ab8f35afe38e16"
+  "gitHead": "8cdec759f298fb20c48194254ccc04b6fdad46bf"
 }