@cubejs-backend/mssql-driver 0.33.11 → 0.33.16

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.33.16](https://github.com/cube-js/cube/compare/v0.33.15...v0.33.16) (2023-05-28)
+
+
+### Bug Fixes
+
+* **mssql-driver:** Pre-aggregations builds hang up if over 10K of rows ([#6661](https://github.com/cube-js/cube/issues/6661)) ([9b20ff4](https://github.com/cube-js/cube/commit/9b20ff4ef78acbb65ebea80adceb227bf96b1727))
+
+
+
+
+
 ## [0.33.11](https://github.com/cube-js/cube/compare/v0.33.10...v0.33.11) (2023-05-22)
 
 **Note:** Version bump only for package @cubejs-backend/mssql-driver

package/driver/MSSqlDriver.js

@@ -58,7 +58,7 @@ class MSSqlDriver extends BaseDriver {
       user: getEnv('dbUser', { dataSource }),
       password: getEnv('dbPass', { dataSource }),
       domain: getEnv('dbDomain', { dataSource }),
-      requestTimeout: 10 * 60 * 1000, // 10 minutes
+      requestTimeout: getEnv('dbQueryTimeout') * 1000,
       options: {
         encrypt: getEnv('dbSsl', { dataSource }),
         useUTC: false
@@ -168,7 +168,7 @@ class MSSqlDriver extends BaseDriver {
         case sql.Money:
         case sql.SmallMoney:
         case sql.Numeric:
-          type = 'float';
+          type = 'decimal';
           break;
         // double
         case sql.Float:
@@ -186,16 +186,16 @@ class MSSqlDriver extends BaseDriver {
           break;
         // date and time
         case sql.Time:
-          type = 'date';
+          type = 'time';
           break;
         case sql.Date:
-          type = 'date';
+          type = 'timestamp';
           break;
         case sql.DateTime:
         case sql.DateTime2:
         case sql.SmallDateTime:
         case sql.DateTimeOffset:
-          type = 'date';
+          type = 'timestamp';
           break;
         // others
         case sql.UniqueIdentifier:
@@ -213,7 +213,7 @@ class MSSqlDriver extends BaseDriver {
           type = 'string';
           break;
       }
-      return { name: fields[field].name, type };
+      return { name: fields[field].name, type: this.toGenericType(type) };
     });
   }
 

package/driver/QueryStream.js

@@ -6,8 +6,7 @@ const { getEnv } = require('@cubejs-backend/shared');
  */
 class QueryStream extends Readable {
   request = null;
-  recordset = [];
-  done = false;
+  toRead = 0;
 
   /**
    * @constructor
@@ -19,32 +18,34 @@ class QueryStream extends Readable {
         highWaterMark || getEnv('dbQueryStreamHighWaterMark'),
     });
     this.request = request;
-    this.request.on('row', (row) => {
-      this.recordset?.push(row);
-      if (this.recordset?.length === getEnv('dbQueryStreamHighWaterMark')) {
+    this.request.on('row', row => {
+      this.transformRow(row);
+      const canAdd = this.push(row);
+      if (this.toRead-- <= 0 || !canAdd) {
         this.request.pause();
       }
-    });
+    })
+    this.request.on('done', () => {
+      this.push(null);
+    })
     this.request.on('error', (err) => {
       this.destroy(err);
     });
-    this.request.on('done', () => {
-      this.done = true;
-    });
   }
 
   /**
    * @override
    */
-  _read(highWaterMark) {
-    const chunk = this.recordset?.splice(0, highWaterMark);
-    chunk?.forEach((row) => {
-      this.push(row);
-    });
-    if (this.recordset?.length === 0 && this.done) {
-      this.push(null);
-    } else {
-      this.request.resume();
+  _read(toRead) {
+    this.toRead += toRead;
+    this.request.resume();
+  }
+
+  transformRow(row) {
+    for (const key in row) {
+      if (row.hasOwnProperty(key) && row[key] && row[key] instanceof Date) {
+        row[key] = row[key].toJSON();
+      }
     }
   }
 
@@ -52,8 +53,8 @@ class QueryStream extends Readable {
    * @override
    */
   _destroy(error, callback) {
+    this.request.cancel();
     this.request = null;
-    this.recordset = null;
     callback(error);
   }
 }

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.33.11",
+  "version": "0.33.16",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -20,5 +20,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "affcdbfacfe51721da7e94bdeb4b5761f2905231"
+  "gitHead": "a30fe6b716e211104addbf1ce840a275c8fef50d"
 }