From 9273edc7944444076c434f201ec2505dd7ce1c8a Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 8 Nov 2021 22:08:47 +0000 Subject: [PATCH] Integrate with UI --- packages/builder/assets/oracle.png | Bin 0 -> 8532 bytes .../DatasourceNavigator/icons/Oracle.svelte | 16 ++ .../DatasourceNavigator/icons/index.js | 2 + packages/builder/src/constants/index.js | 1 + packages/server/src/integrations/oracle.ts | 147 +++++------------- 5 files changed, 62 insertions(+), 104 deletions(-) create mode 100644 packages/builder/assets/oracle.png create mode 100644 packages/builder/src/components/backend/DatasourceNavigator/icons/Oracle.svelte diff --git a/packages/builder/assets/oracle.png b/packages/builder/assets/oracle.png new file mode 100644 index 0000000000000000000000000000000000000000..cc9412605c5d89dd392de1c4c6aee8a0452c52d3 GIT binary patch literal 8532 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 NPMF%@s*T+*{}(kXk&^%b literal 0 HcmV?d00001 diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/Oracle.svelte b/packages/builder/src/components/backend/DatasourceNavigator/icons/Oracle.svelte new file mode 100644 index 0000000000..c939a59d90 --- /dev/null +++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/Oracle.svelte @@ -0,0 +1,16 @@ + + +
+ oracle logo +
+ + diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js index e251595934..56ae03dcc3 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js @@ -10,6 +10,7 @@ import MySQL from "./MySQL.svelte" import ArangoDB from "./ArangoDB.svelte" import Rest from "./Rest.svelte" import Budibase from "./Budibase.svelte" +import Oracle from "./Oracle.svelte" export default { BUDIBASE: Budibase, @@ -24,4 +25,5 @@ export default { MYSQL: MySQL, ARANGODB: ArangoDB, REST: Rest, + ORACLE: Oracle, } diff --git a/packages/builder/src/constants/index.js b/packages/builder/src/constants/index.js index c0d283b0ea..33b55228bd 100644 --- a/packages/builder/src/constants/index.js +++ b/packages/builder/src/constants/index.js @@ -27,6 +27,7 @@ export const IntegrationNames = { SQL_SERVER: "SQL Server", AIRTABLE: "Airtable", ARANGODB: "ArangoDB", + ORACLE: "Oracle", } // fields on the user table that cannot be edited diff --git a/packages/server/src/integrations/oracle.ts b/packages/server/src/integrations/oracle.ts index 2603d08b86..a16c457654 100644 --- a/packages/server/src/integrations/oracle.ts +++ b/packages/server/src/integrations/oracle.ts @@ -2,26 +2,16 @@ import { Integration, DatasourceFieldTypes, QueryTypes, - QueryJson, SqlQuery, } from "../definitions/datasource" import { Table } from "../definitions/common" import { getSqlQuery } from "./utils" -import { DatasourcePlus } from "./base/datasourcePlus" -import oracledb, { Result } from "oracledb" -import { Connection } from "oracledb" +import oracledb, { ExecuteOptions, Result } from "oracledb" +import { Connection, ConnectionAttributes } from "oracledb" import Sql from "./base/sql" -import { FieldTypes } from "../constants" -import { - buildExternalTableId, - convertType, - finaliseExternalTables -} from "./utils" - module OracleModule { oracledb.outFormat = oracledb.OUT_FORMAT_OBJECT; - interface OracleConfig { host: string port: number @@ -34,10 +24,9 @@ module OracleModule { } const SCHEMA: Integration = { - docs: "https://docs", - // plus: true, + docs: "https://github.com/oracle/node-oracledb", friendlyName: "Oracle", - description: "description", + description: "Oracle Database is an object-relational database management system developed by Oracle Corporation", datasource: { host: { type: DatasourceFieldTypes.STRING, @@ -92,37 +81,8 @@ module OracleModule { }, }, } - - const TYPE_MAP = { - // TODO: type map - } - - const internalQuery = async (connection: Connection, query: SqlQuery): Promise | null>=> { - try { - const result: Result = await connection.execute( - `SELECT manager_id, department_id, department_name - FROM departments - WHERE manager_id = :id`, - [103], // bind value for :id - ); - return result - } catch (err) { - console.error(err); - return null - } finally { - if (connection) { - try { - await connection.close(); - } catch (err) { - console.error(err); - } - } - } - } - - class OracleIntegration extends Sql implements DatasourcePlus { + class OracleIntegration extends Sql { private readonly config: OracleConfig - private readonly client: any public tables: Record = {} public schemaErrors: Record = {} @@ -131,76 +91,55 @@ module OracleModule { this.config = config } - getConnection = async (): Promise => { + private query = async (query: SqlQuery): Promise> => { + let connection + try { + connection = await this.getConnection() + + const options : ExecuteOptions = { autoCommit: true } + const result: Result = await connection.execute(query.sql, [], options) + + return result + } finally { + if (connection) { + try { + await connection.close(); + } catch (err) { + console.error(err); + } + } + } + } + + private getConnection = async (): Promise => { //connectString : "(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521))(CONNECT_DATA =(SID= ORCL)))" const connectString = `${this.config.host}:${this.config.port || 1521}/${this.config.database}` - const config = { + const attributes: ConnectionAttributes = { user: this.config.user, password: this.config.user, - connectString + connectString, } - return oracledb.getConnection(config); + return oracledb.getConnection(attributes); } - /** - * Fetches the tables from the postgres table and assigns them to the datasource. - * @param {*} datasourceId - datasourceId to fetch - * @param entities - the tables that are to be built - */ - async buildSchema(datasourceId: string, entities: Record) { - // get the tables - const tables: { [key: string]: Table } = {} - - // get the base table data - // { - // _id: buildExternalTableId(datasourceId, tableName), - // primary: tableKeys[tableName] || [], - // name: tableName, - // schema: {}, - // } - - // get the schema - // { - // autocolumn: isAuto, - // name: columnName, - // type, - // } - - const final = finaliseExternalTables(tables, entities) - this.tables = final.tables - this.schemaErrors = final.errors + async create(query: SqlQuery | string) { + const response = await this.query(getSqlQuery(query)) + return response.rows && response.rows.length ? response.rows : [{ created: true }] } - // async create(query: SqlQuery | string) { - // const response = await internalQuery(this.client, getSqlQuery(query)) - // return response.rows.length ? response.rows : [{ created: true }] - // } + async read(query: SqlQuery | string) { + const response = await this.query(getSqlQuery(query)) + return response.rows + } - // async read(query: SqlQuery | string) { - // const response = await internalQuery(this.client, getSqlQuery(query)) - // return response.rows - // } + async update(query: SqlQuery | string) { + const response = await this.query(getSqlQuery(query)) + return response.rows && response.rows.length ? response.rows : [{ updated: true }] + } - // async update(query: SqlQuery | string) { - // const response = await internalQuery(this.client, getSqlQuery(query)) - // return response.rows.length ? response.rows : [{ updated: true }] - // } - - // async delete(query: SqlQuery | string) { - // const response = await internalQuery(this.client, getSqlQuery(query)) - // return response.rows.length ? response.rows : [{ deleted: true }] - // } - - async query(json: QueryJson) { - const operation = this._operation(json).toLowerCase() - const input = this._query(json) - const connection = await this.getConnection() - const result = await internalQuery(connection, input) - if (result && result.rows && result.rows.length) { - return result.rows - } else { - return [{ [operation]: true }] - } + async delete(query: SqlQuery | string) { + const response = await this.query(getSqlQuery(query)) + return response.rows && response.rows.length ? response.rows : [{ deleted: true }] } }