@budibase/server 2.0.10 → 2.0.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.0.10",
-    "@budibase/client": "^2.0.10",
-    "@budibase/pro": "2.0.9",
-    "@budibase/string-templates": "^2.0.10",
-    "@budibase/types": "^2.0.10",
+    "@budibase/backend-core": "^2.0.11",
+    "@budibase/client": "^2.0.11",
+    "@budibase/pro": "2.0.10",
+    "@budibase/string-templates": "^2.0.11",
+    "@budibase/types": "^2.0.11",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -199,5 +199,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "3e4c3a8599af7f9ec1465b0cfe73f92bde9fe6bd"
+  "gitHead": "33ded6e01311bb5aada0ce4804facf49edfc0376"
 }

package/src/integrations/index.ts

@@ -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
 }

package/src/integrations/oracle.ts

@@ -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
    */