@cubejs-backend/prestodb-driver 0.31.11 → 0.31.13

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.31.13](https://github.com/cube-js/cube.js/compare/v0.31.12...v0.31.13) (2022-11-08)
+
+
+### Bug Fixes
+
+* Make Trino driver CommonJS compatible ([#5581](https://github.com/cube-js/cube.js/issues/5581)) ([ca8fd4e](https://github.com/cube-js/cube.js/commit/ca8fd4e42f4d8f87667507920f02cbb1a7072763))
+
+
+
+
+
+## [0.31.12](https://github.com/cube-js/cube.js/compare/v0.31.11...v0.31.12) (2022-11-05)
+
+
+### Features
+
+* Trino driver ([e58c392](https://github.com/cube-js/cube.js/commit/e58c3924781b65f5631ee241b39a0bee1366273d))
+
+
+
+
+
 ## [0.31.11](https://github.com/cube-js/cube.js/compare/v0.31.10...v0.31.11) (2022-11-02)
 
 

package/dist/src/PrestoDriver.d.ts

@@ -0,0 +1,46 @@
+/**
+ * @copyright Cube Dev, Inc.
+ * @license Apache-2.0
+ * @fileoverview The `PrestoDriver` and related types declaration.
+ */
+import { DownloadQueryResultsOptions, DownloadQueryResultsResult, DriverCapabilities, DriverInterface, StreamOptions, StreamTableData, TableStructure, BaseDriver } from '@cubejs-backend/base-driver';
+export declare type PrestoDriverConfiguration = {
+    host?: string;
+    port?: string;
+    catalog?: string;
+    schema?: string;
+    user?: string;
+    basic_auth?: {
+        user: string;
+        password: string;
+    };
+    ssl?: string;
+    dataSource?: string;
+};
+/**
+ * Presto driver class.
+ */
+export declare class PrestoDriver extends BaseDriver implements DriverInterface {
+    /**
+     * Returns default concurrency value.
+     */
+    static getDefaultConcurrency(): number;
+    private config;
+    private catalog;
+    private client;
+    /**
+     * Class constructor.
+     */
+    constructor(config?: PrestoDriverConfiguration);
+    testConnection(): Promise<void>;
+    query(query: string, values: unknown[]): Promise<any[]>;
+    prepareQueryWithParams(query: string, values: unknown[]): string;
+    queryPromised(query: string, streaming: boolean): Promise<any[] | StreamTableData>;
+    downloadQueryResults(query: string, values: unknown[], options: DownloadQueryResultsOptions): Promise<DownloadQueryResultsResult>;
+    normalizeResultOverColumns(data: any[], columns: TableStructure): {
+        [x: string]: unknown;
+    }[];
+    stream(query: string, values: unknown[], _options: StreamOptions): Promise<StreamTableData>;
+    capabilities(): DriverCapabilities;
+}
+//# sourceMappingURL=PrestoDriver.d.ts.map

package/dist/src/PrestoDriver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PrestoDriver.d.ts","sourceRoot":"","sources":["../../src/PrestoDriver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,2BAA2B,EAAE,0BAA0B,EACvD,kBAAkB,EAAE,eAAe,EACnC,aAAa,EACb,eAAe,EACf,cAAc,EACd,UAAU,EACX,MAAM,6BAA6B,CAAC;AAarC,oBAAY,yBAAyB,GAAG;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,UAAU,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IAChD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,YAAa,SAAQ,UAAW,YAAW,eAAe;IACrE;;OAEG;WACW,qBAAqB;IAInC,OAAO,CAAC,MAAM,CAA4B;IAE1C,OAAO,CAAC,OAAO,CAAqB;IAEpC,OAAO,CAAC,MAAM,CAAM;IAEpB;;OAEG;gBACgB,MAAM,GAAE,yBAA8B;IA8BlD,cAAc;IAWd,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAIvD,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAMvD,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,eAAe,CAAC;IA0DlF,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAOjI,0BAA0B,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,cAAc;;;IAM/D,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAM3F,YAAY,IAAI,kBAAkB;CAK1C"}

package/dist/src/PrestoDriver.js

@@ -0,0 +1,149 @@
+"use strict";
+/**
+ * @copyright Cube Dev, Inc.
+ * @license Apache-2.0
+ * @fileoverview The `PrestoDriver` and related types declaration.
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PrestoDriver = void 0;
+const base_driver_1 = require("@cubejs-backend/base-driver");
+const shared_1 = require("@cubejs-backend/shared");
+const stream_1 = require("stream");
+const ramda_1 = require("ramda");
+const sqlstring_1 = __importDefault(require("sqlstring"));
+const presto = require('presto-client');
+/**
+ * Presto driver class.
+ */
+class PrestoDriver extends base_driver_1.BaseDriver {
+    /**
+     * Class constructor.
+     */
+    constructor(config = {}) {
+        super();
+        const dataSource = config.dataSource ||
+            shared_1.assertDataSource('default');
+        this.config = {
+            host: shared_1.getEnv('dbHost', { dataSource }),
+            port: shared_1.getEnv('dbPort', { dataSource }),
+            catalog: shared_1.getEnv('prestoCatalog', { dataSource }) ||
+                shared_1.getEnv('dbCatalog', { dataSource }),
+            schema: shared_1.getEnv('dbName', { dataSource }) ||
+                shared_1.getEnv('dbSchema', { dataSource }),
+            user: shared_1.getEnv('dbUser', { dataSource }),
+            basic_auth: shared_1.getEnv('dbPass', { dataSource })
+                ? {
+                    user: shared_1.getEnv('dbUser', { dataSource }),
+                    password: shared_1.getEnv('dbPass', { dataSource }),
+                }
+                : undefined,
+            ssl: this.getSslOptions(dataSource),
+            ...config
+        };
+        this.catalog = this.config.catalog;
+        this.client = new presto.Client(this.config);
+    }
+    /**
+     * Returns default concurrency value.
+     */
+    static getDefaultConcurrency() {
+        return 2;
+    }
+    testConnection() {
+        const query = sqlstring_1.default.format('show catalogs like ?', [`%${this.catalog}%`]);
+        return this.queryPromised(query, false)
+            .then(catalogs => {
+            if (catalogs.length === 0) {
+                throw new Error(`Catalog not found '${this.catalog}'`);
+            }
+        });
+    }
+    query(query, values) {
+        return this.queryPromised(this.prepareQueryWithParams(query, values), false);
+    }
+    prepareQueryWithParams(query, values) {
+        return sqlstring_1.default.format(query, (values || []).map(value => (typeof value === 'string' ? {
+            toSqlString: () => sqlstring_1.default.escape(value).replace(/\\\\([_%])/g, '\\$1'),
+        } : value)));
+    }
+    queryPromised(query, streaming) {
+        const toError = (error) => new Error(error.error ? `${error.message}\n${error.error}` : error.message);
+        if (streaming) {
+            const rowStream = new stream_1.Transform({
+                writableObjectMode: true,
+                readableObjectMode: true,
+                transform(obj, encoding, callback) {
+                    callback(null, obj);
+                }
+            });
+            return new Promise((resolve, reject) => {
+                this.client.execute({
+                    query,
+                    schema: this.config.schema || 'default',
+                    columns: (error, columns) => {
+                        resolve({
+                            rowStream,
+                            types: columns
+                        });
+                    },
+                    data: (error, data, columns) => {
+                        const normalData = this.normalizeResultOverColumns(data, columns);
+                        for (const obj of normalData) {
+                            rowStream.write(obj);
+                        }
+                    },
+                    success: () => {
+                        rowStream.end();
+                    },
+                    error: (error) => {
+                        reject(toError(error));
+                    }
+                });
+            });
+        }
+        else {
+            return new Promise((resolve, reject) => {
+                let fullData = [];
+                this.client.execute({
+                    query,
+                    schema: this.config.schema || 'default',
+                    data: (error, data, columns) => {
+                        const normalData = this.normalizeResultOverColumns(data, columns);
+                        fullData = ramda_1.concat(normalData, fullData);
+                    },
+                    success: () => {
+                        resolve(fullData);
+                    },
+                    error: (error) => {
+                        reject(toError(error));
+                    }
+                });
+            });
+        }
+    }
+    downloadQueryResults(query, values, options) {
+        if (options.streamImport) {
+            return this.stream(query, values, options);
+        }
+        return super.downloadQueryResults(query, values, options);
+    }
+    normalizeResultOverColumns(data, columns) {
+        const columnNames = ramda_1.map(ramda_1.prop('name'), columns || []);
+        const arrayToObject = ramda_1.zipObj(columnNames);
+        return ramda_1.map(arrayToObject, data || []);
+    }
+    stream(query, values, _options) {
+        const queryWithParams = this.prepareQueryWithParams(query, values);
+        return this.queryPromised(queryWithParams, true);
+    }
+    capabilities() {
+        return {
+            unloadWithoutTempTable: true
+        };
+    }
+}
+exports.PrestoDriver = PrestoDriver;
+//# sourceMappingURL=PrestoDriver.js.map

package/dist/src/PrestoDriver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PrestoDriver.js","sourceRoot":"","sources":["../../src/PrestoDriver.ts"],"names":[],"mappings":"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"}

package/dist/src/index.d.ts

@@ -0,0 +1,4 @@
+import { PrestoDriver } from './PrestoDriver';
+export default PrestoDriver;
+export { PrestoDriver };
+//# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAe,YAAY,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,CAAC"}

package/dist/src/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PrestoDriver = void 0;
+const PrestoDriver_1 = require("./PrestoDriver");
+Object.defineProperty(exports, "PrestoDriver", { enumerable: true, get: function () { return PrestoDriver_1.PrestoDriver; } });
+exports.default = PrestoDriver_1.PrestoDriver;
+//# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,iDAA8C;AAGrC,6FAHA,2BAAY,OAGA;AADrB,kBAAe,2BAAY,CAAC"}

package/index.js

@@ -0,0 +1,11 @@
+const fromExports = require('./dist/src');
+const { PrestoDriver } = require('./dist/src/PrestoDriver');
+
+const toExport = PrestoDriver;
+
+// eslint-disable-next-line no-restricted-syntax
+for (const [key, module] of Object.entries(fromExports)) {
+  toExport[key] = module;
+}
+
+module.exports = toExport;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/prestodb-driver",
   "description": "Cube.js Presto database driver",
   "author": "Cube Dev, Inc.",
-  "version": "0.31.11",
+  "version": "0.31.13",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.js.git",
@@ -11,17 +11,25 @@
   "engines": {
     "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
   },
-  "main": "driver/PrestoDriver.js",
+  "files": [
+    "dist/src",
+    "index.js"
+  ],
+  "main": "index.js",
+  "typings": "dist/src/index.d.ts",
   "scripts": {
-    "integration": "mocha",
-    "integration:presto": "mocha",
-    "lint": "eslint **/*.js",
-    "lint:fix": "eslint --fix **/*.js"
+    "build": "rm -rf dist && npm run tsc",
+    "tsc": "tsc",
+    "watch": "tsc -w",
+    "integration": "jest dist/test",
+    "integration:presto": "jest dist/test",
+    "lint": "eslint src/* --ext .ts",
+    "lint:fix": "eslint --fix src/* --ext .ts"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "^0.31.11",
-    "@cubejs-backend/shared": "^0.31.0",
-    "presto-client": "^0.12.1",
+    "@cubejs-backend/base-driver": "^0.31.13",
+    "@cubejs-backend/shared": "^0.31.13",
+    "presto-client": "^0.12.2",
     "ramda": "^0.27.0",
     "sqlstring": "^2.3.1"
   },
@@ -31,12 +39,13 @@
   },
   "devDependencies": {
     "@cubejs-backend/linter": "^0.31.0",
-    "mocha": "^8.1.3",
+    "jest": "^26.6.3",
     "should": "^13.2.3",
-    "testcontainers": "^8.12"
+    "testcontainers": "^8.12",
+    "typescript": "~4.1.5"
   },
   "eslintConfig": {
     "extends": "../cubejs-linter"
   },
-  "gitHead": "37e3849be3db4a5a44c0cc6205851bdcd4c70009"
+  "gitHead": "a304fb5d37667569e2ee70c633587d096945a7b0"
 }

package/config/catalog/postgresql.properties

@@ -1,4 +0,0 @@
-connector.name=postgresql
-connection-url=jdbc:postgresql://postgres:5432/presto
-connection-user=presto
-connection-password=9bee2c3975024292eff5829526722ac2

package/docker-compose.yml

@@ -1,13 +0,0 @@
-version: '2.2'
-
-services:
-  coordinator:
-    image: trinodb/trino
-    ports:
-      - "8080:8080"
-    container_name: "coordinator"
-    healthcheck:
-      test: "trino --execute 'SELECT 1' || exit 1"
-      interval: 10s
-      timeout: 5s
-      retries: 5

package/driver/PrestoDriver.js

@@ -1,109 +0,0 @@
-/**
- * @copyright Cube Dev, Inc.
- * @license Apache-2.0
- * @fileoverview The `PrestoDriver` and related types declaration.
- */
-
-const {
-  getEnv,
-  assertDataSource,
-} = require('@cubejs-backend/shared');
-const presto = require('presto-client');
-const {
-  map, zipObj, prop, concat
-} = require('ramda');
-const { BaseDriver } = require('@cubejs-backend/base-driver');
-const SqlString = require('sqlstring');
-
-/**
- * Presto driver class.
- */
-class PrestoDriver extends BaseDriver {
-  /**
-   * Returns default concurrency value.
-   */
-  static getDefaultConcurrency() {
-    return 2;
-  }
-
-  /**
-   * Class constructor.
-   */
-  constructor(config = {}) {
-    super();
-
-    const dataSource =
-      config.dataSource ||
-      assertDataSource('default');
-      
-    this.config = {
-      host: getEnv('dbHost', { dataSource }),
-      port: getEnv('dbPort', { dataSource }),
-      catalog:
-        getEnv('prestoCatalog', { dataSource }) ||
-        getEnv('dbCatalog', { dataSource }),
-      schema:
-        getEnv('dbName', { dataSource }) ||
-        getEnv('dbSchema', { dataSource }),
-      user: getEnv('dbUser', { dataSource }),
-      basic_auth: getEnv('dbPass', { dataSource })
-        ? {
-          user: getEnv('dbUser', { dataSource }),
-          password: getEnv('dbPass', { dataSource }),
-        }
-        : undefined,
-      ssl: this.getSslOptions(dataSource),
-      ...config
-    };
-    this.catalog = this.config.catalog;
-    this.client = new presto.Client(this.config);
-  }
-
-  testConnection() {
-    const query = SqlString.format('show catalogs like ?', [`%${this.catalog}%`]);
-
-    return this.queryPromised(query)
-      .then(catalogs => {
-        if (catalogs.length === 0) {
-          throw new Error(`Catalog not found '${this.catalog}'`);
-        }
-      });
-  }
-
-  query(query, values) {
-    const queryWithParams = SqlString.format(query, (values || []).map(value => (typeof s === 'string' ? {
-      toSqlString: () => SqlString.escape(value).replace(/\\\\([_%])/g, '\\$1')
-    } : value)));
-
-    return this.queryPromised(queryWithParams);
-  }
-
-  queryPromised(query) {
-    return new Promise((resolve, reject) => {
-      let fullData = [];
-
-      this.client.execute({
-        query,
-        schema: this.config.schema || 'default',
-        data: (error, data, columns) => {
-          const normalData = this.normalizeResultOverColumns(data, columns);
-          fullData = concat(normalData, fullData);
-        },
-        success: () => {
-          resolve(fullData);
-        },
-        error: error => {
-          reject(new Error(`${error.message}\n${error.error}`));
-        }
-      });
-    });
-  }
-
-  normalizeResultOverColumns(data, columns) {
-    const columnNames = map(prop('name'), columns || []);
-    const arrayToObject = zipObj(columnNames);
-    return map(arrayToObject, data || []);
-  }
-}
-
-module.exports = PrestoDriver;

package/test/PrestoDriverTest.js

@@ -1,85 +0,0 @@
-/* globals describe, before, after, it */
-const path = require('path');
-const { DockerComposeEnvironment, Wait } = require('testcontainers');
-
-const PrestoDriver = require('../driver/PrestoDriver');
-
-require('should');
-
-describe('PrestoHouseDriver', () => {
-  let env;
-  let config;
-
-  const doWithDriver = async (callback) => {
-    const driver = new PrestoDriver(config);
-
-    await callback(driver);
-  };
-
-  // eslint-disable-next-line consistent-return,func-names
-  before(async function () {
-    this.timeout(6 * 60 * 1000);
-
-    const authOpts = {
-      basic_auth: {
-        user: 'presto',
-        password: ''
-      }
-    };
-
-    if (process.env.TEST_PRESTO_HOST) {
-      config = {
-        host: process.env.TEST_PRESTO_HOST || 'localhost',
-        port: process.env.TEST_PRESTO_PORT || '8080',
-        catalog: process.env.TEST_PRESTO_CATALOG || 'tpch',
-        schema: 'sf1',
-        ...authOpts
-      };
-
-      return;
-    }
-
-    const dc = new DockerComposeEnvironment(
-      path.resolve(path.dirname(__filename), '../'),
-      'docker-compose.yml'
-    );
-
-    env = await dc
-      .withStartupTimeout(240 * 1000)
-      .withWaitStrategy('coordinator', Wait.forHealthCheck())
-      .up();
-
-    config = {
-      host: env.getContainer('coordinator').getHost(),
-      port: env.getContainer('coordinator').getMappedPort(8080),
-      catalog: 'tpch',
-      schema: 'sf1',
-      ...authOpts
-    };
-  });
-
-  // eslint-disable-next-line consistent-return,func-names
-  after(async function () {
-    this.timeout(30 * 1000);
-
-    if (env) {
-      await env.down();
-    }
-  });
-
-  it('should construct', async () => {
-    await doWithDriver(() => {
-      //
-    });
-  });
-
-  // eslint-disable-next-line func-names
-  it('should test connection', async function () {
-    // Presto can be slow after starting...
-    this.timeout(10 * 1000);
-
-    await doWithDriver(async (driver) => {
-      await driver.testConnection();
-    });
-  });
-});