From a7a8ea053bd6a2da0bf953d3244864a0fec5efe5 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 20 Nov 2022 17:03:55 +0100 Subject: [PATCH 1/3] fill native modules - oracledb --- fillNativeModules.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fillNativeModules.js b/fillNativeModules.js index 61dea66eb..cc390b394 100644 --- a/fillNativeModules.js +++ b/fillNativeModules.js @@ -5,9 +5,12 @@ let fillContent = ''; if (process.platform == 'win32') { fillContent += `content.msnodesqlv8 = () => require('msnodesqlv8');`; } +if (process.arch != 'arm64') { + fillContent += `content.oracledb = () => require('oracledb');`; +} fillContent += `content['better-sqlite3'] = () => require('better-sqlite3');`; -const getContent = (empty) => ` +const getContent = empty => ` // this file is generated automatically by script fillNativeModules.js, do not edit it manually const content = {}; From 896cc213869936881753e7955834e50c9acb45ef Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 20 Nov 2022 17:07:21 +0100 Subject: [PATCH 2/3] oracledb added to native dependencies --- adjustPackageJson.js | 3 +++ app/package.json | 1 + app/yarn.lock | 5 +++++ packages/api/package.json | 1 + yarn.lock | 5 +++++ 5 files changed, 15 insertions(+) diff --git a/adjustPackageJson.js b/adjustPackageJson.js index d805f266e..8581fb30c 100644 --- a/adjustPackageJson.js +++ b/adjustPackageJson.js @@ -5,6 +5,9 @@ function adjustFile(file) { if (process.platform != 'win32') { delete json.optionalDependencies.msnodesqlv8; } + if (process.arch == 'arm64') { + delete json.optionalDependencies.oracledb; + } fs.writeFileSync(file, JSON.stringify(json, null, 2), 'utf-8'); } diff --git a/app/package.json b/app/package.json index 06bc10157..3b3e266c9 100644 --- a/app/package.json +++ b/app/package.json @@ -113,6 +113,7 @@ }, "optionalDependencies": { "better-sqlite3": "7.6.2", + "oracledb": "^5.5.0", "msnodesqlv8": "^2.6.0" } } diff --git a/app/yarn.lock b/app/yarn.lock index 7827ccdb2..2d262e719 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -1833,6 +1833,11 @@ open@^7.4.2: is-docker "^2.0.0" is-wsl "^2.1.1" +oracledb@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/oracledb/-/oracledb-5.5.0.tgz#0cf9af5d0c0815f74849ae9ed56aee823514d71b" + integrity sha512-i5cPvMENpZP8nnqptB6l0pjiOyySj1IISkbM4Hr3yZEDdANo2eezarwZb9NQ8fTh5pRjmgpZdSyIbnn9N3AENw== + os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" diff --git a/packages/api/package.json b/packages/api/package.json index 8190e5805..a3005862b 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -75,6 +75,7 @@ }, "optionalDependencies": { "better-sqlite3": "7.6.2", + "oracledb": "^5.5.0", "msnodesqlv8": "^2.6.0" } } diff --git a/yarn.lock b/yarn.lock index f5a01b77e..6bbefb4a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8195,6 +8195,11 @@ optionator@^0.8.1, optionator@^0.8.3: resolved "https://registry.yarnpkg.com/opts/-/opts-2.0.2.tgz#a17e189fbbfee171da559edd8a42423bc5993ce1" integrity sha512-k41FwbcLnlgnFh69f4qdUfvDQ+5vaSDnVPFI/y5XuhKRq97EnVVneO9F1ESVCdiVu4fCS2L8usX3mU331hB7pg== +oracledb@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/oracledb/-/oracledb-5.5.0.tgz#0cf9af5d0c0815f74849ae9ed56aee823514d71b" + integrity sha512-i5cPvMENpZP8nnqptB6l0pjiOyySj1IISkbM4Hr3yZEDdANo2eezarwZb9NQ8fTh5pRjmgpZdSyIbnn9N3AENw== + os-browserify@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" From 9c1c008b0d4b3847052bb5dfdd04893ea1209652 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 20 Nov 2022 17:08:19 +0100 Subject: [PATCH 3/3] v5.1.7-beta.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f39e63e8a..07f0f8f00 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "5.1.6", + "version": "5.1.7-beta.1", "name": "dbgate-all", "workspaces": [ "packages/*",