Merge pull request #8062 from Budibase/fix/oracle-dev-fix
OracleDB development machine fix
This commit is contained in:
commit
04dac2e445
|
@ -57,7 +57,11 @@ const INTEGRATIONS: { [key: string]: any } = {
|
|||
}
|
||||
|
||||
// optionally add oracle integration if the oracle binary can be installed
|
||||
if (process.arch && !process.arch.startsWith("arm")) {
|
||||
if (
|
||||
process.arch &&
|
||||
!process.arch.startsWith("arm") &&
|
||||
oracle.integration.isInstalled()
|
||||
) {
|
||||
DEFINITIONS[SourceName.ORACLE] = oracle.schema
|
||||
INTEGRATIONS[SourceName.ORACLE] = oracle.integration
|
||||
}
|
||||
|
|
|
@ -15,17 +15,22 @@ import {
|
|||
getSqlQuery,
|
||||
SqlClient,
|
||||
} from "./utils"
|
||||
import oracledb, {
|
||||
import Sql from "./base/sql"
|
||||
import { FieldTypes } from "../constants"
|
||||
import {
|
||||
BindParameters,
|
||||
Connection,
|
||||
ConnectionAttributes,
|
||||
ExecuteOptions,
|
||||
Result,
|
||||
} from "oracledb"
|
||||
import Sql from "./base/sql"
|
||||
import { FieldTypes } from "../constants"
|
||||
|
||||
oracledb.outFormat = oracledb.OUT_FORMAT_OBJECT
|
||||
let oracledb: any
|
||||
try {
|
||||
oracledb = require("oracledb")
|
||||
oracledb.outFormat = oracledb.OUT_FORMAT_OBJECT
|
||||
} catch (err) {
|
||||
console.log("ORACLEDB is not installed")
|
||||
}
|
||||
|
||||
interface OracleConfig {
|
||||
host: string
|
||||
|
@ -183,6 +188,10 @@ class OracleIntegration extends Sql implements DatasourcePlus {
|
|||
return parts.join(" || ")
|
||||
}
|
||||
|
||||
static isInstalled() {
|
||||
return oracledb != null
|
||||
}
|
||||
|
||||
/**
|
||||
* Map the flat tabular columns and constraints data into a nested object
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue