diff --git a/packages/server/scripts/integrations/oracle/docker-compose.yml b/packages/server/scripts/integrations/oracle/docker-compose.yml index 15b4c16eee..2fe6c2f574 100644 --- a/packages/server/scripts/integrations/oracle/docker-compose.yml +++ b/packages/server/scripts/integrations/oracle/docker-compose.yml @@ -16,4 +16,4 @@ services: - oracle_data:/opt/oracle/oradata volumes: - oracle_data: + oracle_data: \ No newline at end of file diff --git a/packages/server/scripts/integrations/oracle/instantclient/linux/arm64/basiclite-19.10.zip b/packages/server/scripts/integrations/oracle/instantclient/linux/arm64/basiclite-19.10.zip deleted file mode 100644 index a6ab63b68e..0000000000 Binary files a/packages/server/scripts/integrations/oracle/instantclient/linux/arm64/basiclite-19.10.zip and /dev/null differ diff --git a/packages/server/scripts/integrations/oracle/instantclient/linux/arm64/install.sh b/packages/server/scripts/integrations/oracle/instantclient/linux/arm64/install.sh deleted file mode 100755 index 7b7402673d..0000000000 --- a/packages/server/scripts/integrations/oracle/instantclient/linux/arm64/install.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# Must be root to continue -if [[ $(id -u) -ne 0 ]] ; then echo "Please run as root" ; exit 1 ; fi - -# Allow for re-runs -rm -rf /opt/oracle - -echo "Installing oracle instant client" - -# copy and unzip package -mkdir -p /opt/oracle -cp scripts/integrations/oracle/instantclient/linux/arm64/basiclite-19.10.zip /opt/oracle -cd /opt/oracle -unzip -qq basiclite-19.10.zip -d . -rm *.zip -mv instantclient* instantclient - -# update runtime link path -sh -c "echo /opt/oracle/instantclient > /etc/ld.so.conf.d/oracle-instantclient.conf" -ldconfig /etc/ld.so.conf.d - -echo "Installation complete" diff --git a/packages/server/scripts/integrations/oracle/instantclient/linux/install.sh b/packages/server/scripts/integrations/oracle/instantclient/linux/install.sh deleted file mode 100755 index 4662996a44..0000000000 --- a/packages/server/scripts/integrations/oracle/instantclient/linux/install.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && pwd 2> /dev/null; )" -if [[ $TARGETARCH == arm* ]] ; -then - echo "Installing ARM Oracle instant client..." - $SCRIPT_DIR/arm64/install.sh -else - echo "Installing x86-64 Oracle instant client..." - $SCRIPT_DIR/x86-64/install.sh -fi diff --git a/packages/server/scripts/integrations/oracle/instantclient/linux/x86-64/basiclite-21.4.zip b/packages/server/scripts/integrations/oracle/instantclient/linux/x86-64/basiclite-21.4.zip deleted file mode 100644 index 777bccbe0f..0000000000 Binary files a/packages/server/scripts/integrations/oracle/instantclient/linux/x86-64/basiclite-21.4.zip and /dev/null differ diff --git a/packages/server/scripts/integrations/oracle/instantclient/linux/x86-64/install.sh b/packages/server/scripts/integrations/oracle/instantclient/linux/x86-64/install.sh deleted file mode 100755 index 1225860a1a..0000000000 --- a/packages/server/scripts/integrations/oracle/instantclient/linux/x86-64/install.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# Must be root to continue -if [[ $(id -u) -ne 0 ]] ; then echo "Please run as root" ; exit 1 ; fi - -# Allow for re-runs -rm -rf /opt/oracle - -echo "Installing oracle instant client" - -# copy and unzip package -mkdir -p /opt/oracle -cp scripts/integrations/oracle/instantclient/linux/x86-64/basiclite-21.4.zip /opt/oracle -cd /opt/oracle -unzip -qq basiclite-21.4.zip -d . -rm *.zip -mv instantclient* instantclient - -# update runtime link path -sh -c "echo /opt/oracle/instantclient > /etc/ld.so.conf.d/oracle-instantclient.conf" -ldconfig /etc/ld.so.conf.d - -echo "Installation complete" \ No newline at end of file diff --git a/packages/server/scripts/integrations/oracle/oracle.md b/packages/server/scripts/integrations/oracle/oracle.md index 58d2a7dfbf..fccbc9c00f 100644 --- a/packages/server/scripts/integrations/oracle/oracle.md +++ b/packages/server/scripts/integrations/oracle/oracle.md @@ -10,16 +10,16 @@ To install oracle express edition simply run `docker-compose up` - A single instance pluggable database (PDB) will be created named `xepdb1` - The default password is configured in the compose file as `oracle` - - The `system` and `pdbadmin` users share this password + - The `system` and `pdbadmin` users share this password -## Instant Client +## Instant Client Before oracle can be connected to from nodejs, the oracle client must be installed. For more information see https://www.oracle.com/database/technologies/instant-client/downloads.html **Important** - Oracle client is supported only on **x86-64 architecture** -- Oracle client is **not supported on Mac ARM architecture** +- Oracle client is **not supported on Mac ARM architecture** ### Linux Run the provided install script for linux from the `server` root path: @@ -29,7 +29,7 @@ sudo /bin/bash -e scripts/integrations/oracle/instantclient/linux/x86-64/install ``` For more information see: https://www.oracle.com/database/technologies/instant-client/linux-x86-64-downloads.html#ic_x64_inst -### Mac +### Mac **This has not yet been tested** See: https://www.oracle.com/database/technologies/instant-client/macos-intel-x86-downloads.html#ic_osx_inst @@ -64,7 +64,7 @@ grant create session, to &USERNAME; ``` -To set the password for the sales schema use: +To set the password for the sales schema use: ```sql define USERNAME = sales @@ -80,11 +80,10 @@ docker exec -it oracle-xe sqlplus -l sales/sales@localhost:1521/xepdb1 ## HR Schema -The `HR` schema is populated with dummy data by default in oracle for testing purposes. +The `HR` schema is populated with dummy data by default in oracle for testing purposes. To connect to the HR schema first update the user password and unlock the account by performing ```sql ALTER USER hr ACCOUNT UNLOCK; ALTER USER hr IDENTIFIED BY hr; ``` You should now be able to connect to the hr schema using the credentials hr/hr -