feat(trino-driver): Use headers prefix specifically to Trino (X-Trino-) (#10904)

Author: ovr

packages/cubejs-prestodb-driver/package.json

@@ -29,7 +29,7 @@
   "dependencies": {
     "@cubejs-backend/base-driver": "1.6.47",
     "@cubejs-backend/shared": "1.6.47",
-    "presto-client": "^1.1.0",
+    "presto-client": "^1.2.0",
     "ramda": "^0.27.0",
     "sqlstring": "^2.3.1"
   },

packages/cubejs-prestodb-driver/src/PrestoDriver.ts

@@ -39,7 +39,11 @@ export type PrestoDriverExportBucket = {
   exportBucketCsvEscapeSymbol?: string,
 };
 
-export type PrestoDriverConfiguration = PrestoDriverExportBucket & {
+export type PrestoDriverInternalConfiguration = {
+    engine?: 'presto' | 'trino';
+};
+
+export type PrestoDriverConfiguration = PrestoDriverExportBucket & PrestoDriverInternalConfiguration & {
   host?: string;
   port?: string;
   catalog?: string;
@@ -125,6 +129,7 @@ export class PrestoDriver extends BaseDriver implements DriverInterface {
     this.catalog = this.config.catalog;
     this.client = new presto.Client({
       timeout: this.config.queryTimeout,
+      engine: 'presto',
       ...this.config,
     });
   }

packages/cubejs-prestodb-driver/src/index.ts

@@ -2,3 +2,5 @@ import { PrestoDriver } from './PrestoDriver';
 
 export default PrestoDriver;
 export { PrestoDriver };
+
+export type { PrestoDriverConfiguration, PrestoDriverInternalConfiguration, PrestoDriverExportBucket } from './PrestoDriver';

packages/cubejs-trino-driver/package.json

@@ -33,7 +33,7 @@
     "@cubejs-backend/schema-compiler": "1.6.47",
     "@cubejs-backend/shared": "1.6.47",
     "node-fetch": "^2.6.1",
-    "presto-client": "^1.1.0",
+    "presto-client": "^1.2.0",
     "sqlstring": "^2.3.1"
   },
   "license": "Apache-2.0",

packages/cubejs-trino-driver/src/TrinoDriver.ts

@@ -1,9 +1,11 @@
 import fetch from 'node-fetch';
-import { PrestoDriver } from '@cubejs-backend/prestodb-driver';
+import { PrestoDriver, PrestoDriverConfiguration } from '@cubejs-backend/prestodb-driver';
 import { PrestodbQuery } from '@cubejs-backend/schema-compiler';
 
+export type TrinoDriverConfiguration = Omit<PrestoDriverConfiguration, 'engine'>;
+
 export class TrinoDriver extends PrestoDriver {
-  public constructor(options: any) {
+  public constructor(options: TrinoDriverConfiguration = {}) {
     super({ ...options, engine: 'trino' });
   }
 

yarn.lock

@@ -21528,10 +21528,10 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-presto-client@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/presto-client/-/presto-client-1.1.0.tgz#cf0fe8a445db73c1e025256f5868fadaef4017a0"
-  integrity sha512-DOWEKp0eHP/x6Fupk5673vZND7OUxFtV9VUO9HMvf4DFzoWKTLMRAJ3o5/7Mgs5z9w5BEUKU88IZaume6LMelw==
+presto-client@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/presto-client/-/presto-client-1.2.0.tgz#7f6c4d78092298fa4b107775f8a2fabe008772e9"
+  integrity sha512-mBwc6nZMGWbo9tRkDLxE6eZ4pyGlS08TeNJnF5zpRww02l6ASxQ14jdVNk+AcFrxNdI7yEDOBQXr+gK2KPiTOw==
   dependencies:
     follow-redirects "^1.15.3"