gopherdata - npm Package Compare versions

Comparing version 0.1.2 to 0.1.3

CHANGELOG.md

 # Change Log
 
-## gopherdata v0.1.2 (10 Mar 2017)
 
-- Fixes crash found in ```gopher-connect```:
+## Gopher v0.1.3 (13 Mar 2017)
 
+- **Updates ```gopher-response```:**
+
+  - ```gopherResponse``` function now uses Promises
+
+  - ```gopherResponse``` is now an arrow function
+
+- **Updates ```gopher-connect```:**
+
+  - ```runTransaction``` function has been updated to receive Promises from ```gopherResponse``` function
+
+
+## Gopher v0.1.2 (10 Mar 2017)
+
+- **Fixes crash found in ```gopher-connect```:**
+
   - The ```runTransaction``` function now will return a ORA-12514 db error without crashing
 
 
-## gopherdata v0.1.1 (4 Mar 2017)
+## Gopher v0.1.1 (4 Mar 2017)
 
-- Changes ```gopher-connect```:
+- **Updates ```gopher-connect```:**
 
@@ -17,5 +31,5 @@ - Explicitly sets the oracle driver's auto-commit option to ```true```
 
-## gopherdata v0.1.0 (4 Mar 2017)
+## Gopher v0.1.0 (4 Mar 2017)
 
-- Fixes crash found in ```gopher-response.js```:
+- **Fixes crash found in ```gopher-response.js```:**
 
@@ -25,3 +39,3 @@ - Both ```dbStatement``` and ```metrics``` response views now handle an "undefined" response from the database
 
-- Changes ```gopher-response.js```:
+- **Changes ```gopher-response.js```:**
 
@@ -33,3 +47,3 @@ - ```error``` message now reads ```error = false``` instead of ```error = {"message:":"No Error!"}```
 
-- Changes ```gopher.js```:
+- **Changes ```gopher.js```:**
 
@@ -39,5 +53,5 @@ - To more accurately reflect it's function,```Gopher.query``` is now called using the following nomenclature:  ```Gopher.runStatement```
 
-- Adds ```CHANGELOG.md``` file
+- **Adds ```CHANGELOG.md``` file**
 
-- Updates ```README.md``` file
+- **Updates ```README.md``` file**
 
@@ -48,3 +62,3 @@ - Minor changes
 
-## gopherdata v0.0.1 (23 Feb 2017 - initial release)
+## Gopher v0.0.1 (23 Feb 2017 - initial release)
 
@@ -51,0 +65,0 @@ **Initial Features Include**:

lib/gopher-connect.js

@@ -12,6 +12,4 @@ /*****************************************************************
 const gopherResponse = require('./gopher-response.js');
-const gopherTools = require('./gopher-tools');
+const gopherTools = require('./gopher-tools')
 
-oracledb.autoCommit = true;
-
 /******************************************************************
@@ -72,3 +70,3 @@ Close a Database connection
   if (bindVariablesPresent === true && Object.keys(transactionObject.bindVariables).length <1){
-    var errMsg = 'One or more of the following bind variables not set: '+ bindVariableNames;
+    let errMsg = 'One or more of the following bind variables not set: '+ bindVariableNames;
     //set connnection end time
@@ -79,9 +77,7 @@ Object.assign(transactionObject,{"endTimeObject": gopherTime.getDateObject()});
     //pass to gopherResponse
-    return gopherResponse(connectionObject,transactionObject,'ERROR',
-      function(gophErr,gophRes){
-        if(gophErr){callback(gophErr,'ERROR')}
-        callback(errMsg,gophRes);}
-    );
+    return gopherResponse(connectionObject, transactionObject, 'ERROR')
+            .then((gophRes)=>{callback(errMsg,gophRes)})
+            .catch((gophErr)=>{callback(gophErr,'ERROR')})
   }else if (bindVariablesPresent === false && Object.keys(transactionObject.bindVariables).length >0){
-    var errMsg = 'Bind variables set, but none exist within the database statement';
+    let errMsg = 'Bind variables set, but none exist within the database statement';
     //set connnection end time
@@ -92,7 +88,5 @@ Object.assign(transactionObject,{"endTimeObject": gopherTime.getDateObject()});
     //pass to gopherResponse
-    return gopherResponse(connectionObject,transactionObject,'ERROR',
-      function(gophErr,gophRes){
-        if(gophErr){callback(gophErr,'ERROR')}
-        callback(errMsg,gophRes);}
-    );
+    return gopherResponse(connectionObject, transactionObject, 'ERROR')
+            .then((gophRes)=>{callback(errMsg,gophRes)})
+            .catch((gophErr)=>{callback(gophErr,'ERROR')})
   }
@@ -115,7 +109,5 @@
         //pass to gopherResponse
-        return gopherResponse(connectionObject,transactionObject,'ERROR',
-          function(gophErr,gophRes){
-            if(gophErr){callback(gophErr,'ERROR')}
-            callback(errMsg,gophRes);}
-        );
+        return gopherResponse(connectionObject, transactionObject, 'ERROR')
+                .then((gophRes)=>{callback(errMsg,gophRes)})
+                .catch((gophErr)=>{callback(gophErr,'ERROR')})
       }
@@ -130,8 +122,5 @@ }
     //pass to gopherResponse
-    return gopherResponse(connectionObject,transactionObject,'ERROR',
-      function(gophErr,gophRes){
-        if(gophErr){callback(gophErr,'ERROR')}
-        callback(errMsg,gophRes);
-      }
-    )
+    return gopherResponse(connectionObject, transactionObject, 'ERROR')
+            .then((gophRes)=>{callback(errMsg,gophRes)})
+            .catch((gophErr)=>{callback(gophErr,'ERROR')})
   }
@@ -157,3 +146,3 @@
       //Handle "getConnection" Errors
-      if (err) {return callback(err,'ERROR');}
+      if (err) {callback(err,'ERROR');}
       oraConnect.execute(
@@ -172,7 +161,5 @@ transactionObject.dbStatement,
               //pass to gopherResponse
-              return gopherResponse(connectionObject,transactionObject,'ERROR',
-                function(gophErr,gophRes){
-                  if(gophErr){callback(gophErr,'ERROR')}
-                  callback(oraErr,gophRes);}
-              );
+              return gopherResponse(connectionObject, transactionObject, 'ERROR')
+                      .then((gophRes)=>{callback(oraErr,gophRes);})
+                      .catch((gophErr)=>{callback(gophErr,'ERROR');})
           }
@@ -185,15 +172,11 @@ //Close database connection
               Object.assign(transactionObject,{"error":{"errType":'oracle',"errMsg": closeConnectionErr}});
-              return gopherResponse(connectionObject,transactionObject,'ERROR',
-                function(gophErr,gophRes){
-                  if(gophErr){callback(gophErr,'ERROR')}
-                  callback(undefined,gophRes);}
-              );
+              return gopherResponse(connectionObject, transactionObject, 'ERROR')
+                      .then((gophRes)=>{callback(closeConnectionErr,gophRes)})
+                      .catch((gophErr)=>{callback(gophErr,'ERROR')})
             }
             //set connnection end time
             Object.assign(transactionObject,{"endTimeObject": gopherTime.getDateObject()});
-            return gopherResponse(connectionObject,transactionObject,dbResponse,
-              function(gophErr,gophRes){
-                if(gophErr){callback(gophErr,'ERROR')}
-                callback(undefined,gophRes);}
-            );
+            return gopherResponse(connectionObject, transactionObject, dbResponse)
+                    .then((gophRes)=>{callback(undefined,gophRes)})
+                    .catch((gophErr)=>{callback(gophErr,'ERROR')})
           });
@@ -200,0 +183,0 @@ }

lib/gopher-response.js

@@ -17,8 +17,9 @@ /*****************************************************************
 *******************************************************************/
-function gopherResponse (
+var gopherResponse = (
   connectionObject,
   transactionObject,
-  dbResponse,
-  callback){
+  dbResponse) => {
 
+return new Promise ((resolve, reject) => {
+
 //set time signature variables for utc or local time----------------------------
@@ -85,3 +86,3 @@ var startTimestamp;
           function(err,res){
-            if (err || res === undefined) {return callback(err,err);}
+            if (err || res === undefined) {return reject(err);}
             if (res === null) {
@@ -223,5 +224,7 @@ Object.assign(dbStatement,{"bindVariablesPresent":false});
 
-return callback(undefined,gopherResponse);
+      return resolve(gopherResponse);
+
+  })
 }
 
 module.exports = gopherResponse;

package.json

 {
   "name": "gopherdata",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Develop, Maintain, Organize, and Send your recycled database statements from outside of an Oracle Database. Develop and execute canned or dynamic DDL/DML statements that are stored within library files (in json format) executed from a Node.js configured environment against an Oracle backend.",
@@ -5,0 +5,0 @@ "author": {

No alert changes

Improved metrics

Total package byte prevSize

106448

increased by0.22%

Worsened metrics

Lines of code

1502

decreased by-0.99%

No dependency changes