xardao 1.4.0 → 1.4.2

package/lib/driver-snowflake.js

@@ -57,6 +57,7 @@ class Connection {
     execMultiple() {}
     readTableStructure() {}
     close() {}
+    setNoCount() {}
     
     debug(f,s) {
        if (this.debugMode) console.error(f + ": " + s)

package/lib/driver_mariadb.js

@@ -57,6 +57,7 @@ class Connection {
     execMultiple() {}
     readTableStructure() {}
     close() {}
+    setNoCount() {}
     
     debug(f,s) {
        if (this.debugMode) console.error(f + ": " + s)

package/lib/driver_mssql.js

@@ -44,6 +44,7 @@ class Connection {
         this.commitTrans = ESNext(this.commitTransCB, this)
         this.rollbackTrans = ESNext(this.rollbackTransCB, this) 
         this.close = ESNext(this.closeCB, this)
+        this.noCount = false
     }
 
     open() {}
@@ -57,6 +58,9 @@ class Connection {
     execMultiple() {}
     readTableStructure() {}
     close() {}
+    setNoCount() {
+        this.noCount = true
+    }
     
     debug(f,s) {
        if (this.debugMode) console.error(f + ": " + s)
@@ -331,7 +335,8 @@ class Connection {
         var ts = Date.now()
         var realSql = this.getRealSql(params); 
         this.debug("execSingle",realSql)
-        realSql = realSql + "; select @@ROWCOUNT, @@IDENTITY"
+        if ( ! this.noCount ) realSql = realSql + "; select @@ROWCOUNT, @@IDENTITY"
+        this.noCount = false
         let request = new mssql.Request(realSql, function(err, rowcount, rows)  {
             if (err) { 
                 self.debug("execSingle",'Error: '+err.code)

package/lib/driver_pgsql.js

@@ -57,6 +57,7 @@ class Connection {
     execMultiple() {}
     readTableStructure() {}
     close() {}
+    setNoCount() {}
     
     debug(f,s) {
        if (this.debugMode) console.error(f + ": " + s)

package/lib/driver_sqlite3.js

@@ -59,6 +59,7 @@ class Connection {
     execMultiple() {}
     readTableStructure() {}
     close() {}
+    setNoCount() {}
 
     debug(f,s) {
        if (this.debugMode) console.error(f + ": " + s)

package/lib/xardao.js

@@ -102,8 +102,10 @@ exports.Connection = Connection
 exports.express = {}
 exports.express.usingDBConnection = function usingDBConnection(connSpec, page ) {
 
+
+
     return function(req, res, next) {
-        var connInfo 
+
         if (typeof(connSpec) == "object") connInfo = connSpec
         else if (typeof(connSpec) == "string" ){ 
             if ( req.appconfig ) connInfo = req.appconfig[connSpec]
@@ -114,25 +116,39 @@ exports.express.usingDBConnection = function usingDBConnection(connSpec, page )
         else throw "Invalid database specification"
 
         if (typeof(connInfo) == 'string') {
-                connInfo = { driver:connInfo, dbInfo: undefined}
-        }
-
-        var db = Connection(connInfo.driver)
-        db.debugMode = connInfo.debugMode || false
-        db.openCB(connInfo.dbInfo, 
-            function (err) { 
-                if (err) { next(err) }
-                else { 
-                    res.on("finish", 
-                    function() { 
-                        db.close() 
-                    } )  
-                    req.conn=db
-                    page(req, res, next)
-                }
+                let db = new Connection(connInfo)
+                db.debugMode = connSpec.debugMode || false
+                db.openCB(undefined, 
+                    function (err) { 
+                        if (err) { next(err) }
+                        else { 
+                            res.on("finish", 
+                            function() { 
+                                db.close() 
+                            } )  
+                            req.conn=db
+                            page(req, res, next)
+                        }
+                    }
+                )
+            } else if (typeof(connInfo) == "object"){
+            let db = Connection(connInfo.driver)
+            db.debugMode = connInfo.debugMode || false
+            db.openCB(connInfo.dbInfo, 
+                function (err) { 
+                    if (err) { next(err) }
+                    else { 
+                        res.on("finish", 
+                        function() { 
+                            db.close() 
+                        } )  
+                        req.conn=db
+                        page(req, res, next)
+                    }
+                } )
+            } else {
+                throw "Invalid database specification"
             }
-        )
-
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xardao",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Common Relational Data Access library",
   "main": "./lib/xardao.js",
   "scripts": {