fix(redshift-driver): Dont load user defined types

cube-js · Aug 15, 2021 · 1ea0a44 · 1ea0a44
1 parent 044ba8e
commit 1ea0a44
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/packages/cubejs-postgres-driver/src/PostgresDriver.ts b/packages/cubejs-postgres-driver/src/PostgresDriver.ts
@@ -127,15 +127,7 @@ export class PostgresDriver<Config extends PostgresDriverConfiguration = Postgre
     }
   }
 
-  protected async prepareConnection(
-    conn: PoolClient,
-    options: { executionTimeout: number } = {
-      executionTimeout: this.config.executionTimeout ? <number>(this.config.executionTimeout) * 1000 : 600000
-    }
-  ) {
-    await conn.query(`SET TIME ZONE '${this.config.storeTimezone || 'UTC'}'`);
-    await conn.query(`SET statement_timeout TO ${options.executionTimeout}`);
-
+  protected async loadUserDefinedTypes(conn: PoolClient): Promise<void> {
     if (!this.userDefinedTypes) {
       const customTypes = await conn.query(
         "SELECT oid, typname FROM pg_type WHERE typcategory = 'U'",
@@ -149,6 +141,18 @@ export class PostgresDriver<Config extends PostgresDriverConfiguration = Postgre
     }
   }
 
+  protected async prepareConnection(
+    conn: PoolClient,
+    options: { executionTimeout: number } = {
+      executionTimeout: this.config.executionTimeout ? <number>(this.config.executionTimeout) * 1000 : 600000
+    }
+  ) {
+    await conn.query(`SET TIME ZONE '${this.config.storeTimezone || 'UTC'}'`);
+    await conn.query(`SET statement_timeout TO ${options.executionTimeout}`);
+
+    await this.loadUserDefinedTypes(conn);
+  }
+
   public async stream(
     query: string,
     values: unknown[],

diff --git a/packages/cubejs-redshift-driver/src/RedshiftDriver.ts b/packages/cubejs-redshift-driver/src/RedshiftDriver.ts
@@ -64,6 +64,10 @@ export class RedshiftDriver extends PostgresDriver<RedshiftDriverConfiguration>
     return undefined;
   }
 
+  public async loadUserDefinedTypes(): Promise<void> {
+    // @todo Implement for Redshift, column \"typcategory\" does not exist in pg_type
+  }
+
   public async isUnloadSupported() {
     if (this.config.exportBucket) {
       return true;