CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-06-28 11:00:55 +12:00
Code Issues Projects Releases Wiki Activity

Use global sql type map, update base integration type defs

Browse source
This commit is contained in:
Rory Powell 2021-11-22 11:38:17 +00:00
parent 154a5cab26
commit ac7137c4a0
3 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/server/src/integrations/base/IntegrationBase.ts
View file

@ -1,6 +1,6 @@
export interface IntegrationBase {
create?(query: any): Promise<[any]>
read?(query: any): Promise<[any]>
update?(query: any): Promise<[any]>
delete?(query: any): Promise<[any]>
create?(query: any): Promise<any[]>
read?(query: any): Promise<any[]>
update?(query: any): Promise<any[]>
delete?(query: any): Promise<any[]>
}

27
packages/server/src/integrations/oracle.ts
View file

@ -9,7 +9,7 @@ import {
finaliseExternalTables,
getSqlQuery,
buildExternalTableId,
convertType,
convertSqlType,
} from "./utils"
import oracledb, {
ExecuteOptions,
@ -82,15 +82,6 @@ module OracleModule {
const UNSUPPORTED_TYPES = ["BLOB", "CLOB", "NCLOB"]
const TYPE_MAP = {
long: FieldTypes.LONGFORM,
number: FieldTypes.NUMBER,
binary_float: FieldTypes.NUMBER,
binary_double: FieldTypes.NUMBER,
timestamp: FieldTypes.DATETIME,
date: FieldTypes.DATETIME,
}
/**
* Raw query response
*/
@ -292,7 +283,7 @@ module OracleModule {
return FieldTypes.BOOLEAN
}
return convertType(column.type, TYPE_MAP)
return convertSqlType(column.type)
}
/**
@ -393,26 +384,26 @@ module OracleModule {
return oracledb.getConnection(attributes)
}
async create(query: SqlQuery | string) {
const response = await this.internalQuery(getSqlQuery(query))
async create(query: SqlQuery | string): Promise<any[]> {
const response = await this.internalQuery<any>(getSqlQuery(query))
return response.rows && response.rows.length
? response.rows
: [{ created: true }]
}
async read(query: SqlQuery | string) {
const response = await this.internalQuery(getSqlQuery(query))
return response.rows
async read(query: SqlQuery | string): Promise<any[]> {
const response = await this.internalQuery<any>(getSqlQuery(query))
return response.rows ? response.rows : []
}
async update(query: SqlQuery | string) {
async update(query: SqlQuery | string): Promise<any[]> {
const response = await this.internalQuery(getSqlQuery(query))
return response.rows && response.rows.length
? response.rows
: [{ updated: true }]
}
async delete(query: SqlQuery | string) {
async delete(query: SqlQuery | string): Promise<any[]> {
const response = await this.internalQuery(getSqlQuery(query))
return response.rows && response.rows.length
? response.rows

4
packages/server/src/integrations/utils.ts
View file

@ -32,6 +32,10 @@ const SQL_TYPE_MAP = {
fixed: FieldTypes.NUMBER,
datetime: FieldTypes.DATETIME,
tinyint: FieldTypes.BOOLEAN,
long: FieldTypes.LONGFORM,
number: FieldTypes.NUMBER,
binary_float: FieldTypes.NUMBER,
binary_double: FieldTypes.NUMBER,
}
export enum SqlClients {