From b2821029985655f78dbde036ad4e8d825e8eb14b Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Wed, 1 Jun 2022 09:36:42 +0100 Subject: [PATCH] Revert "Datasource plus - build schema" This reverts commit 3c1d32ba24810e5f52d094d21107725105063784. --- packages/builder/src/constants/index.js | 1 - packages/server/src/integrations/snowflake.ts | 100 ++---------------- packages/server/src/integrations/utils.ts | 2 - 3 files changed, 9 insertions(+), 94 deletions(-) diff --git a/packages/builder/src/constants/index.js b/packages/builder/src/constants/index.js index bf42443638..abeaadc718 100644 --- a/packages/builder/src/constants/index.js +++ b/packages/builder/src/constants/index.js @@ -29,7 +29,6 @@ export const IntegrationNames = { ARANGODB: "ArangoDB", ORACLE: "Oracle", GOOGLE_SHEETS: "Google Sheets", - SNOWFLAKE: "Snowflake", } // fields on the user table that cannot be edited diff --git a/packages/server/src/integrations/snowflake.ts b/packages/server/src/integrations/snowflake.ts index 950c1009ec..f9335ecf4e 100644 --- a/packages/server/src/integrations/snowflake.ts +++ b/packages/server/src/integrations/snowflake.ts @@ -1,27 +1,12 @@ -import { - Integration, - QueryTypes, - SqlQuery, - DatasourceFieldTypes, -} from "../definitions/datasource" +import { Integration, QueryTypes, SqlQuery } from "../definitions/datasource" import { SnowflakeError, Statement, createConnection, Connection, } from "snowflake-sdk" -import { - SqlClients, - finaliseExternalTables, - buildExternalTableId, - convertSqlType, -} from "./utils" -import { DatasourcePlus } from "./base/datasourcePlus" -import { Table, TableSchema } from "../definitions/common" module SnowflakeModule { - const Sql = require("./base/sql") - interface SnowflakeConfig { account: string username: string @@ -32,34 +17,33 @@ module SnowflakeModule { } const SCHEMA: Integration = { - plus: true, docs: "https://developers.snowflake.com/", description: "Snowflake is a solution for data warehousing, data lakes, data engineering, data science, data application development, and securely sharing and consuming shared data.", friendlyName: "Snowflake", datasource: { account: { - type: DatasourceFieldTypes.STRING, + type: "string", required: true, }, username: { - type: DatasourceFieldTypes.STRING, + type: "string", required: true, }, password: { - type: DatasourceFieldTypes.PASSWORD, + type: "password", required: true, }, warehouse: { - type: DatasourceFieldTypes.STRING, + type: "string", required: true, }, database: { - type: DatasourceFieldTypes.STRING, + type: "string", required: true, }, schema: { - type: DatasourceFieldTypes.STRING, + type: "string", required: true, }, }, @@ -79,77 +63,13 @@ module SnowflakeModule { }, } - class SnowflakeIntegration extends Sql implements DatasourcePlus { + class SnowflakeIntegration { private client: Connection - private config: SnowflakeConfig - public tables: Record = {} - public schemaErrors: Record = {} constructor(config: SnowflakeConfig) { - super(SqlClients.SNOWFLAKE) - this.config = config this.client = createConnection(config) } - getBindingIdentifier(): string { - return "?" - } - - getStringConcat(parts: string[]): string { - return `concat(${parts.join(", ")})` - } - - async buildSchema(datasourceId: string, entities: Record) { - const tables: { [key: string]: Table } = {} - const database = this.config.database - - // get the tables first - const tablesResp = await this.internalQuery({ sql: "SHOW TABLES;" }) - const tableNames = tablesResp.map((obj: any) => obj.name) - for (let tableName of tableNames) { - const primaryKeys = [] - const schema: TableSchema = {} - const descResp = await this.internalQuery({ - sql: `DESCRIBE TABLE ${tableName};`, - }) - if (tableName === "CUSTOMER") { - console.log("DESC = ", descResp) - } - for (let column of descResp) { - const columnName = column.Field - if ( - column["primary key"] === "Y" && - primaryKeys.indexOf(column.Key) === -1 - ) { - primaryKeys.push(columnName) - } - const constraints = { - presence: column["null?"] !== "Y", - } - const isAuto: boolean = column.default - ?.toLowerCase() - .includes("increment") - schema[columnName] = { - name: columnName, - autocolumn: isAuto, - constraints, - ...convertSqlType(column["type"]), - } - } - if (!tables[tableName]) { - tables[tableName] = { - _id: buildExternalTableId(datasourceId, tableName), - primary: primaryKeys, - name: tableName, - schema, - } - } - } - const final = finaliseExternalTables(tables, entities) - this.tables = final.tables - this.schemaErrors = final.errors - } - async connectAsync() { return new Promise((resolve, reject) => { this.client.connect(function (err: any, conn: any) { @@ -160,9 +80,7 @@ module SnowflakeModule { } async internalQuery(query: SqlQuery) { - if (!this.client.isUp()) { - await this.connectAsync() - } + await this.connectAsync() let response: any = await new Promise((resolve, reject) => this.client.execute({ sqlText: query.sql, diff --git a/packages/server/src/integrations/utils.ts b/packages/server/src/integrations/utils.ts index 8627a73aeb..7e4efad84f 100644 --- a/packages/server/src/integrations/utils.ts +++ b/packages/server/src/integrations/utils.ts @@ -73,7 +73,6 @@ export enum SqlClients { POSTGRES = "pg", MY_SQL = "mysql2", ORACLE = "oracledb", - SNOWFLAKE = "snowflake-sdk", } export function isExternalTable(tableId: string) { @@ -174,7 +173,6 @@ export function isSQL(datasource: Datasource): boolean { SourceNames.SQL_SERVER, SourceNames.MYSQL, SourceNames.ORACLE, - SourceNames.SNOWFLAKE, ] return SQL.indexOf(datasource.source) !== -1 }