[WIP] fix: replace missing Oralce XE image

README.md

@@ -464,12 +464,17 @@ npm test
 ```
 
 ### Docker
+
+[ODPI-C](https://oracle.github.io/odpi/doc/installation.html) is a prerequisite, install on your system
+before performing the next steps.
+
 If you do not have a local Oracle instance, you can also run the test suite with very minimal requirements.
 - Assuming you have [Docker](https://docs.docker.com/engine/installation/) installed, run the following script which would spawn an Oracle instance on your local machine:
+
 ```bash
 source setup.sh <HOST> <PORT>
 ```
-where `<HOST>`, `<PORT>`, `<USER>`, and `PASSWORD` are optional parameters. The default values are `localhost`, `1521`, `admin`, and `0raclep4ss` respectively. The `DATABASE` setting is always `XE`.
+where `<HOST>`, `<PORT>`, `<USER>`, and `PASSWORD` are optional parameters. The default values are `localhost`, `1521`, `system`, and `oracle` respectively. The `DATABASE` setting is always `XE`.
 - Run the test:
 ```bash
 npm test

lib/oracle.js

@@ -349,13 +349,13 @@ function dateToOracle(val, dateOnly) {
   }
 
   let dateStr = [
-    val.getUTCFullYear(),
-    fz(val.getUTCMonth() + 1),
-    fz(val.getUTCDate()),
+    val.getFullYear(),
+    fz(val.getMonth() + 1),
+    fz(val.getDate()),
   ].join('-') + ' ' + [
-    fz(val.getUTCHours()),
-    fz(val.getUTCMinutes()),
-    fz(val.getUTCSeconds()),
+    fz(val.getHours()),
+    fz(val.getMinutes()),
+    fz(val.getSeconds()),
   ].join(':');
 
   if (!dateOnly) {

package.json

@@ -16,6 +16,7 @@
   "scripts": {
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
+    "pretest": "bash ./setup.sh",
     "test": "mocha --UV_THREADPOOL_SIZE=100 test/*.test.js node_modules/juggler-v3/test.js node_modules/juggler-v4/test.js",
     "posttest": "npm run lint"
   },

setup.sh

@@ -10,12 +10,12 @@ CYAN='\033[1;36m'
 PLAIN='\033[0m'
 
 ## variables
-ORACLE_CONTAINER="oracle_c"
+ORACLE_CONTAINER="oracle-xe"
 HOST="localhost"
 PORT=1521
 DATABASE="XE"
-USER="admin"
-PASSWORD="0raclep4ss"
+USER="SYSTEM"
+PASSWORD="oracle"
 if [ "$1" ]; then
     HOST=$1
 fi
@@ -46,12 +46,12 @@ printf "\n${CYAN}Clean up complete.${PLAIN}\n"
 
 ## pull latest oracle image
 printf "\n${RED}>> Pulling latest oracle image${PLAIN} ${GREEN}...${PLAIN}"
-docker pull sath89/oracle-xe-11g:latest > /dev/null 2>&1
+docker pull webdizz/oracle-xe-11g-sa:latest > /dev/null 2>&1
 printf "\n${CYAN}Image successfully built.${PLAIN}\n"
 
 ## run the oracle container
 printf "\n${RED}>> Starting the oracle container${PLAIN} ${GREEN}...${PLAIN}\n"
-docker run --name $ORACLE_CONTAINER -p $PORT:1521 -d sath89/oracle-xe-11g:latest > /dev/null 2>&1
+docker run --name $ORACLE_CONTAINER -p $PORT:1521 -d webdizz/oracle-xe-11g-sa:latest > /dev/null 2>&1
 
 ##wait for orale database container to be ready
 OUTPUT=1
@@ -86,40 +86,13 @@ printf "\n${RED}>> Exporting schema to database${PLAIN} ${GREEN}...${PLAIN}\n"
 ## copy over our db seed file
 docker cp ./test/tables.sql $ORACLE_CONTAINER:/home/ > /dev/null 2>&1
 
-##make user, give it privileges, and copy sql file to container
-CREATEUSER="CREATE USER ${USER} IDENTIFIED by \"${PASSWORD}\";\n \
-GRANT CONNECT, RESOURCE, DBA TO ${USER};\n \
-GRANT CREATE SESSION TO ${USER};\n \
-GRANT UNLIMITED TABLESPACE TO ${USER};\r"
+## create the tables
+printf "\n${GREEN}Waiting for database to respond with updated schema ..."
+docker exec $ORACLE_CONTAINER /bin/sh -c "echo exit | sqlplus ${USER}/${PASSWORD}@//${HOST}:${PORT}/${DATABASE} @/home/tables.sql"
 
-touch dockerusercreate.sql && echo ${CREATEUSER} > dockerusercreate.sql
-docker cp dockerusercreate.sql $ORACLE_CONTAINER:/home/ > /dev/null 2>&1
-rm dockerusercreate.sql
-## run create user script
-docker exec -it $ORACLE_CONTAINER /bin/sh -c "echo exit | sqlplus sys/oracle@//${HOST}:${PORT}/${DATABASE} as sysdba @/home/dockerusercreate.sql" > /dev/null 2>&1
-
-
-## variables needed to health check export schema
 OUTPUT=$?
-TIMEOUT=120
-TIME_PASSED=0
-WAIT_STRING="."
 
-printf "\n${GREEN}Waiting for database to respond with updated schema $WAIT_STRING${PLAIN}"
-while [ "$OUTPUT" -ne 0 ] && [ "$TIMEOUT" -gt 0 ]
-    do
-        docker exec -it $ORACLE_CONTAINER /bin/sh -c "echo exit | sqlplus ${USER}/{$PASSWORD}@//${HOST}:${PORT}/${DATABASE} @/home/tables.sql" > /dev/null 2>&1
-        OUTPUT=$?
-        sleep 1s
-        TIMEOUT=$((TIMEOUT - 1))
-        TIME_PASSED=$((TIME_PASSED + 1))
-        if [ "$TIME_PASSED" -eq 5 ]; then
-            printf "${GREEN}.${PLAIN}"
-            TIME_PASSED=0
-        fi
-    done
-
-if [ "$TIMEOUT" -le 0 ]; then
+if [ "$OUTPUT" -ne 0 ]; then
     printf "\n\n${CYAN}Status: ${PLAIN}${RED}Failed to export schema. Terminating setup.${PLAIN}\n\n"
     exit 1
 fi

test/init/init.js

@@ -10,6 +10,8 @@ let DataSource = juggler.DataSource;
 
 const config = require('rc')('loopback', {test: {oracle: {}}}).test.oracle;
 config.maxConn = 64;
+config.user = config.user || process.env.ORACLE_USER;
+config.password = config.password || process.env.ORACLE_PASSWORD;
 
 let db;
 

test/oracle.autoupdate.test.js

@@ -22,7 +22,7 @@ describe('Oracle connector', function() {
       options: {
         idInjection: false,
         oracle: {
-          schema: 'TEST',
+          schema: 'SYSTEM',
           table: 'CUSTOMER_TEST',
         },
       },
@@ -55,7 +55,7 @@ describe('Oracle connector', function() {
       options: {
         idInjection: false,
         oracle: {
-          schema: 'TEST',
+          schema: 'SYSTEM',
           table: 'CUSTOMER_TEST',
         },
       },

test/oracle.clob.test.js

@@ -17,7 +17,7 @@ before(function(done) {
       name: 'ClobTest',
       options: {
         oracle: {
-          schema: 'TEST',
+          schema: 'SYSTEM',
           table: 'CLOB_TEST',
         },
       },

test/oracle.connectionpool.test.js

@@ -16,6 +16,8 @@ let db, config;
 
 before(function() {
   config = require('rc')('loopback', {dev: {oracle: {}}}).dev.oracle;
+  config.user = config.user || process.env.ORACLE_USER;
+  config.password = config.password || process.env.ORACLE_PASSWORD;
 });
 
 after(function() {

test/oracle.discover.test.js

@@ -17,6 +17,8 @@ let db;
 describe('discoverModels', function() {
   before(function() {
     const config = require('rc')('loopback', {dev: {oracle: {}}}).dev.oracle;
+    config.user = config.user || process.env.ORACLE_USER;
+    config.password = config.password || process.env.ORACLE_PASSWORD;
     db = new DataSource(require('../'), config);
   });
 
@@ -97,7 +99,7 @@ describe('discoverModels', function() {
           let others = false;
           models.forEach(function(m) {
             // console.dir(m);
-            if (m.owner !== 'STRONGLOOP') {
+            if (m.owner !== 'SYSTEM') {
               others = true;
             }
           });
@@ -126,7 +128,7 @@ describe('discoverModels', function() {
       });
 
       it('should return an array of columns for PRODUCT ', function(done) {
-        db.discoverModelProperties('PRODUCT', {schema: 'STRONGLOOP'},
+        db.discoverModelProperties('PRODUCT', {schema: 'SYSTEM'},
           function(err, models) {
             if (err) {
               console.error(err);
@@ -159,9 +161,9 @@ describe('discoverModels', function() {
       });
     });
 
-    it('should return an array of primary keys for STRONGLOOP.PRODUCT',
+    it('should return an array of primary keys for SYSTEM.PRODUCT',
       function(done) {
-        db.discoverPrimaryKeys('PRODUCT', {owner: 'STRONGLOOP'},
+        db.discoverPrimaryKeys('PRODUCT', {owner: 'SYSTEM'},
           function(err, models) {
             if (err) {
               console.error(err);
@@ -192,9 +194,9 @@ describe('discoverModels', function() {
         }
       });
     });
-    it('should return an array of foreign keys for STRONGLOOP.INVENTORY',
+    it('should return an array of foreign keys for SYSTEM.INVENTORY',
       function(done) {
-        db.discoverForeignKeys('INVENTORY', {owner: 'STRONGLOOP'},
+        db.discoverForeignKeys('INVENTORY', {owner: 'SYSTEM'},
           function(err, models) {
             if (err) {
               console.error(err);
@@ -212,11 +214,11 @@ describe('discoverModels', function() {
 
   describe('Discover LDL schema from a table', function() {
     it('should return an LDL schema for INVENTORY', function(done) {
-      db.discoverSchema('INVENTORY', {owner: 'STRONGLOOP'},
+      db.discoverSchema('INVENTORY', {owner: 'SYSTEM'},
         function(err, schema) {
         // console.log('%j', schema);
           assert(schema.name === 'Inventory');
-          assert(schema.options.oracle.schema === 'STRONGLOOP');
+          assert(schema.options.oracle.schema === 'SYSTEM');
           assert(schema.options.oracle.table === 'INVENTORY');
           assert(schema.properties.productId);
           assert(schema.properties.productId.type === 'String');

test/oracle.mapping.js

@@ -26,7 +26,7 @@ describe('Mapping models', function() {
         options: {
           idInjection: false,
           oracle: {
-            schema: 'TEST', 'table': 'INVENTORY_TEST',
+            schema: 'SYSTEM', 'table': 'INVENTORY_TEST',
           },
         },
         properties: {

test/oracle.test.js

@@ -6,8 +6,8 @@
 'use strict';
 
 /* global getDataSource */
-var juggler = require('loopback-datasource-juggler');
-var CreateDS = juggler.DataSource;
+const juggler = require('loopback-datasource-juggler');
+const CreateDS = juggler.DataSource;
 
 require('./init/init');
 const should = require('should');

test/tables.sql

@@ -2,7 +2,7 @@
 --  File created - Thursday-September-05-2013
 --------------------------------------------------------
 DROP TABLE CUSTOMER CASCADE CONSTRAINTS PURGE;
-DROP TABLE SESSION CASCADE CONSTRAINTS PURGE;
+DROP TABLE SESS CASCADE CONSTRAINTS PURGE;
 DROP TABLE LOCATION CASCADE CONSTRAINTS PURGE;
 DROP TABLE PRODUCT CASCADE CONSTRAINTS PURGE;
 DROP TABLE INVENTORY CASCADE CONSTRAINTS PURGE;
@@ -28,7 +28,7 @@ DROP TABLE RESERVATION CASCADE CONSTRAINTS PURGE;
 	"CREATED" DATE,
 	"LASTUPDATED" DATE
    ) ;
-/
+
 --------------------------------------------------------
 --  DDL for Table INVENTORY
 --------------------------------------------------------
@@ -40,7 +40,7 @@ DROP TABLE RESERVATION CASCADE CONSTRAINTS PURGE;
 	"AVAILABLE" NUMBER(22,0),
 	"TOTAL" NUMBER(22,0)
    ) ;
-/
+
 
 -- CREATE SEQUENCE INVENTORY_ID_SEQ START WITH 1 INCREMENT BY 1 NOMAXVALUE;
 -- CREATE OR REPLACE TRIGGER INVENTORY_ID_TRIGGER BEFORE
@@ -60,7 +60,7 @@ DROP TABLE RESERVATION CASCADE CONSTRAINTS PURGE;
 	"NAME" VARCHAR2(32),
 	"GEO" VARCHAR2(1024)
    ) ;
-/
+
 --------------------------------------------------------
 --  DDL for Table PRODUCT
 --------------------------------------------------------
@@ -74,7 +74,7 @@ DROP TABLE RESERVATION CASCADE CONSTRAINTS PURGE;
 	"EXTRAS" VARCHAR2(64),
 	"FIRE_MODES" VARCHAR2(64)
    ) ;
-/
+
 --------------------------------------------------------
 --  DDL for Table RESERVATION
 --------------------------------------------------------
@@ -90,17 +90,17 @@ DROP TABLE RESERVATION CASCADE CONSTRAINTS PURGE;
 	"PICKUP_DATE" DATE,
 	"RETURN_DATE" DATE
    ) ;
-/
+
 --------------------------------------------------------
---  DDL for Table SESSION
+--  DDL for Table SESS
 --------------------------------------------------------
 
-  CREATE TABLE "SESSION"
+  CREATE TABLE "SESS"
    (	"ID" VARCHAR2(64),
 	"UID" VARCHAR2(1024),
 	"TTL" NUMBER
    ) ;
-/
+
 REM INSERTING into CUSTOMER
 SET DEFINE OFF;
 Insert into CUSTOMER (ID,USERNAME,EMAIL,PASSWORD,NAME,MILITARY_AGENCY,REALM,EMAILVERIFIED,VERIFICATIONTOKEN,CREDENTIALS,CHALLENGES,STATUS,CREATED,LASTUPDATED) values ('612','bat','[email protected]','$2a$10$BEG18wcYQn7TRkFIc59EB.vmnsEwqJWMlYM4DNG73iZb.MKA1rjAC',null,null,null,null,null,'[]','[]',null,null,null);
@@ -723,7 +723,7 @@ Insert into PRODUCT (ID,NAME,AUDIBLE_RANGE,EFFECTIVE_RANGE,ROUNDS,EXTRAS,FIRE_MO
 Insert into PRODUCT (ID,NAME,AUDIBLE_RANGE,EFFECTIVE_RANGE,ROUNDS,EXTRAS,FIRE_MODES) values ('5','M9 SD',0,75,15,'Silenced','Single');
 REM INSERTING into RESERVATION
 SET DEFINE OFF;
-REM INSERTING into "SESSION"
+REM INSERTING into "SESS"
 SET DEFINE OFF;
 
 --------------------------------------------------------
@@ -746,31 +746,31 @@ CREATE OR REPLACE VIEW INVENTORY_VIEW
 --------------------------------------------------------
 
   ALTER TABLE "CUSTOMER" ADD PRIMARY KEY ("ID") ENABLE;
-/
+
 --------------------------------------------------------
 --  Constraints for Table INVENTORY
 --------------------------------------------------------
 
   ALTER TABLE "INVENTORY" ADD PRIMARY KEY ("ID") ENABLE;
-/
+
 --------------------------------------------------------
 --  Constraints for Table LOCATION
 --------------------------------------------------------
 
   ALTER TABLE "LOCATION" ADD PRIMARY KEY ("ID") ENABLE;
-/
+
 --------------------------------------------------------
 --  Constraints for Table PRODUCT
 --------------------------------------------------------
 
   ALTER TABLE "PRODUCT" ADD PRIMARY KEY ("ID") ENABLE;
-/
+
 --------------------------------------------------------
---  Constraints for Table SESSION
+--  Constraints for Table SESS
 --------------------------------------------------------
 
-  ALTER TABLE "SESSION" ADD PRIMARY KEY ("ID") ENABLE;
-/
+  ALTER TABLE "SESS" ADD PRIMARY KEY ("ID") ENABLE;
+
 --------------------------------------------------------
 --  Ref Constraints for Table INVENTORY
 --------------------------------------------------------
@@ -779,7 +779,7 @@ CREATE OR REPLACE VIEW INVENTORY_VIEW
 	  REFERENCES "LOCATION" ("ID") ENABLE;
   ALTER TABLE "INVENTORY" ADD CONSTRAINT "PRODUCT_FK" FOREIGN KEY ("PRODUCT_ID")
 	  REFERENCES "PRODUCT" ("ID") ENABLE;
-/
+
 --------------------------------------------------------
 --  Ref Constraints for Table RESERVATION
 --------------------------------------------------------
@@ -790,4 +790,4 @@ CREATE OR REPLACE VIEW INVENTORY_VIEW
 	  REFERENCES "LOCATION" ("ID") ENABLE;
   ALTER TABLE "RESERVATION" ADD CONSTRAINT "RESERVATION_PRODUCT_FK" FOREIGN KEY ("PRODUCT_ID")
 	  REFERENCES "PRODUCT" ("ID") ENABLE;
-/
+