xardao 1.2.4 → 1.3.1

package/.vscode/launch.json

@@ -5,7 +5,7 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "type": "pwa-node",
+            "type": "node",
             "request": "launch",
             "name": "Launch Program",
             "skipFiles": [

package/lib/common.js

@@ -1,6 +1,6 @@
 /********************************************************************************
  * rdao_common.js
- * Common elements in rdao implementation.
+ * Common elements in xardao implementation.
  * 
  * Author : Stephane Potelle 
  * Email  : stephane.potelle@gmail.com
@@ -97,9 +97,7 @@ exports.sqlParam = function(cn,value) {
     return 'null'
 }
 
-// Base implementation of the "mergeParams" method. 
-// Specific drivers may use their own version of it.
-exports.mergeParams = function(cn,sql, params) {
+exports.mergeParams_old = function(cn,sql, params) {
     var keys = Object.keys(params);
     var osql = sql;
     for ( let i = 0; i< keys.length; i++) {
@@ -109,6 +107,34 @@ exports.mergeParams = function(cn,sql, params) {
     return osql;
 }
 
+// Base implementation of the "mergeParams" method. 
+// Specific drivers may use their own version of it.
+exports.mergeParams = function(cn,sql, params) {
+    let rt = []
+    let isql = sql
+    let uparams = {}
+    for ( let k of Object.keys(params)) {
+        uparams[k.toLowerCase()] = params[k]
+    }
+
+    while (true) {
+        let p = isql.search( /@\w+/)
+        if (p == -1 ) {
+            rt.push(isql)
+            break
+        } else {
+            rt.push(isql.substring(0, p))
+            let fn = /@(\w+)/i.exec(isql)
+            let v = uparams[fn[1].toLowerCase()]
+            if ( v === undefined ) 
+                throw ( `Missing value for parameter ${fn[0]} `)
+            rt.push(cn.sqlParam(v))
+            isql = isql.substring(p+fn[0].length)
+        }
+    }
+    return rt.join('')
+}
+
 // Base implementation of the "getRealSql" method. 
 // Specific drivers may use their own version of it.
 exports.getRealSql = function(cn,queryObject) {

package/lib/crud-adapter.js

@@ -197,12 +197,12 @@ class CRUDAdapter {
             if (err) callback(err) 
             else {
                 p = self.normalizeParameters( p )
-                self.conn.getDataTable(self.selectStatement(p), function(err, dt) {
+                self.conn.getObjects(self.selectStatement(p), function(err, dt) {
                     if (err) callback(err) 
                     else {
-                        if (dt.rows.length>0) {
-                            self.content = dt.rows[0].toObject()
-                            self.prevContent = dt.rows[0].toObject() // Make sure we have a clone.
+                        if (dt.rlength>0) {
+                            self.content = dt[0]
+                            self.prevContent = dt[0]
                             callback(undefined, self.content)
                         } else {
                             self.clear()

package/lib/driver_mariadb.js

@@ -1,6 +1,6 @@
 /********************************************************************************
  * driver_mariadb.js
- * MariaDB rdao driver
+ * MariaDB xardao driver
  * 
  * Author : Stephane Potelle 
  * Email  : stephane.potelle@gmail.com
@@ -14,7 +14,6 @@ try {
     process.exit(1)
 }
 
-var data = require('./datatable.js');
 var common = require ('./common.js');
 var ESNext = require('./esnext');
 
@@ -32,7 +31,6 @@ class Connection {
         this.connUrlInfo=connUrlInfo
 
         this.open = ESNext(this.openCB,this)
-        this.getDataTable = ESNext(this.getDataTableCB,this)
         this.getObjects = ESNext(this.getObjectsCB,this)
         this.getSingleObject  = ESNext(this.getSingleObjectCB ,this)
         this.getList = ESNext(this.getListCB,this)
@@ -45,12 +43,10 @@ class Connection {
         this.beginTrans = ESNext(this.beginTransCB, this)
         this.commitTrans = ESNext(this.commitTransCB, this)
         this.rollbackTrans = ESNext(this.rollbackTransCB, this)     
-        this.forEachRow = ESNext(this.forEachRowCB, this)            
         this.close = ESNext(this.closeCB,this)
     }
 
     open() {}
-    getDataTable() {}
     getObjects() {}
     getSingleObject () {}    
     getList() {}
@@ -67,8 +63,18 @@ class Connection {
     }
 
     openCB(dbInfo, callback) {
-        if (dbInfo)  this.db =  new mysql.createConnection(dbInfo);
-        else this.db = new mysql.createConnection({ host: this.connUrlInfo.hostname, user: this.connUrlInfo.username, password: this.connUrlInfo.password, database: this.connUrlInfo.database})
+        if ( typeof(this.connUrlInfo) == 'object' ) {
+            let conninfo = { 
+                host: this.connUrlInfo.hostname, 
+                user: this.connUrlInfo.username, 
+                password: this.connUrlInfo.password, 
+                database: this.connUrlInfo.database
+            }
+            this.db = new mysql.createConnection( conninfo )
+        }
+        else { 
+            this.db =  new mysql.createConnection(dbInfo)
+        }
         this.debug('open','Opening connection for MariaDB')
         this.db.connect( callback )
     }
@@ -125,80 +131,7 @@ class Connection {
     mergeParams(sql, params) { return common.mergeParams(this, sql, params) }
     getRealSql(queryObject) { return common.getRealSql(this, queryObject) }
 
-    forEachRowCB(params, eachfunc, callback) {
-        var ts = Date.now();
-        var realSql = this.getRealSql(params); 
-        var self = this;
-        this.debug("forEachRow",realSql);
-
-        let query = this.db.query(realSql)
-        query.on("error", function(err) {
-                self.debug("forEachRow",'Error: '+err.code);
-                then( function() {callback(err)}) ;
-            })
-            .on("fields", function(fields) {})
-            .on("result", function(row) {
-                self.db.pause()
-                eachfunc (row, function() {
-                    self.db.resume()
-                })
-            })
-            .on("end", function() {
-                self.debug("forEachRow",'Completed in ' + (Date.now() -ts) + ' ms');
-                callback()
-            })
-    }    
-
-
-    getDataTableCB(params, callback) {
-        var ts = Date.now();
-        var realSql = this.getRealSql(params); 
-        var self = this;
-        var useSnakeCase = false
-        var useCamelCase = false        
-        if ( params.options ) {
-            useSnakeCase = params.options.useSnakeCase || false
-            useCamelCase = params.options.useCamelCase || false
-        }
-
-        this.debug("getDataTable",realSql);
-        this.db.query({sql: realSql, timeout: this.timeoutMilliSeconds }, function(err, rows, fields)  {
-            let dt = new data.DataTable;
-
-            function finish() {
-                self.debug("getDataTable",'Completed in ' + (Date.now() -ts) + ' ms');
-                if (isFunction(callback)) then( function() { callback(undefined, dt) } );            
-            }
-
-            if (err) {
-                self.debug("getDataTable",'Error: '+err.code);
-                then( function() {callback(err)}) ;
-            } else {
-                if (rows.length > 0 ) {
-                    let cols = Object.keys(rows[0])
-                    for (let c = 0; c< cols.length; c++) {
-                        if (useSnakeCase) dt.addColumn(common.toSnakeCase(cols[c]))
-                        else if (useCamelCase) dt.addColumn(common.toCamelCase(cols[c]))
-                        else  dt.addColumn(cols[c])
-                    }
-
-                    let r = 0
-                    then( function populateTable() {
-                        if (r<rows.length) {
-                            dt.addRow( dt.newRow(rows[r]));
-                            r++
-                            then(populateTable)
-                        } else {
-                            finish()
-                        }
-                    } )
-                } else {
-                    finish()
-                }
-            }
-        });
-    }
-
+   
     getObjectsCB(params, callback) {
         var ts = Date.now();
         var realSql = this.getRealSql(params); 
@@ -268,7 +201,7 @@ class Connection {
         var ts = Date.now();
         var realSql = this.getRealSql(params); 
         var self = this;
-        this.debug("getDataTable",realSql);
+        this.debug("getList",realSql);
         this.db.query({sql: realSql, timeout: this.timeoutMilliSeconds }, function(err,rows, fields)  {
             if (err) {
                 self.debug("getList",'Error: '+err.code);
@@ -314,7 +247,7 @@ class Connection {
         var ts = Date.now();
         var realSql = this.getRealSql(params); 
         var self = this;
-        this.debug("getDataTable",realSql);
+        this.debug("getKVList",realSql);
         this.db.query({sql: realSql, timeout: this.timeoutMilliSeconds }, function(err,rows, fields)  {
             if (err) {
                 self.debug("getKVList",'Error: '+err.code);
@@ -340,7 +273,7 @@ class Connection {
         var ts = Date.now();
         var realSql = this.getRealSql(params); 
         var self = this;
-        this.debug("getDataTable",realSql);
+        this.debug("getScalar",realSql);
         this.db.query({sql: realSql, timeout: this.timeoutMilliSeconds }, function(err,rows, fields)  {
             if (err) {
                 self.debug("getScalar",'Error: '+err.code);

package/lib/driver_mssql.js

@@ -1,6 +1,6 @@
 /********************************************************************************
  * driver_mssql.js
- * MSSQL rdao driver
+ * MSSQL xardao driver
  * 
  * Author : Stephane Potelle 
  * Email  : stephane.potelle@gmail.com
@@ -14,7 +14,6 @@ try {
     process.exit(1)
 }
 
-var data = require('./datatable.js')
 var common = require ('./common.js')
 var ESNext = require('./esnext')
 
@@ -32,7 +31,6 @@ class Connection {
         this.connUrlInfo=connUrlInfo
 
         this.open = ESNext(this.openCB, this)
-        this.getDataTable = ESNext(this.getDataTableCB, this)
         this.getObjects = ESNext(this.getObjectsCB, this)
         this.getSingleObject  = ESNext(this.getSingleObjectCB , this)
         this.getList = ESNext(this.getListCB, this)
@@ -45,12 +43,10 @@ class Connection {
         this.beginTrans = ESNext(this.beginTransCB, this)
         this.commitTrans = ESNext(this.commitTransCB, this)
         this.rollbackTrans = ESNext(this.rollbackTransCB, this) 
-        this.forEachRow = ESNext(this.forEachRowCB, this)           
         this.close = ESNext(this.closeCB, this)
     }
 
     open() {}
-    getDataTable() {}
     getObjects() {}
     getSingleObject () {}
     getList() {}
@@ -151,85 +147,8 @@ class Connection {
     }
 
     mergeParams(sql, params) { return common.mergeParams(this, sql, params) }
-    getRealSql(queryObject) { return common.getRealSql(this, queryObject) }
-
-    forEachRowCB(params, eachfunc, callback) {
-        var ts = Date.now()
-        var realSql = this.getRealSql(params); 
-        var self = this
-        let fields = []
 
-        this.debug("getDataTable",realSql)
-        let dt = new data.DataTable
-        let headersRead = false
-        let request = new mssql.Request(realSql, function(err, rows, fields)  {
-            if (err) {
-                self.debug("getDataTable",'Error: '+err.code)
-                then( function() {callback(err)}) 
-            } else {
-                self.debug("getDataTable",'Completed in ' + (Date.now() -ts) + ' ms')
-                if (isFunction(callback)) then( function() { callback(undefined, dt) } )
-            }
-        })
-        request.setTimeout( this.timeoutMilliSeconds ) 
-        request.on('row', function(columns) { 
-            if (! headersRead ) {
-                for ( let i=0; i< columns.length; i++) {
-                    fields.push(columns[i].metadata.colName)
-                }
-                headersRead = true
-            }
-            let dr = {}
-            for ( let i=0; i< columns.length; i++) {
-                dr[fields[i]]=columns[i].value
-            }
-            request.pause()
-            eachfunc(dr, function() { request.resume()})
-        }) 
-        this.db.execSql(request)
-    }
-
-    getDataTableCB(params, callback) {
-        var ts = Date.now()
-        var realSql = this.getRealSql(params); 
-        var self = this
-        var useSnakeCase = false
-        var useCamelCase = false        
-        if ( params.options ) {
-            useSnakeCase = params.options.useSnakeCase || false
-            useCamelCase = params.options.useCamelCase || false
-        }
-
-        this.debug("getDataTable",realSql)
-        let dt = new data.DataTable
-        let headersRead = false
-        let request = new mssql.Request(realSql, function(err, rows, fields)  {
-            if (err) {
-                self.debug("getDataTable",'Error: '+err.code)
-                then( function() {callback(err)}) 
-            } else {
-                self.debug("getDataTable",'Completed in ' + (Date.now() -ts) + ' ms')
-                if (isFunction(callback)) then( function() { callback(undefined, dt) } )
-            }
-        })
-        request.setTimeout( this.timeoutMilliSeconds ) 
-        request.on('row', function(columns) { 
-            if (! headersRead ) {
-                for ( let i=0; i< columns.length; i++) {
-                    if (useSnakeCase) dt.addColumn(common.toSnakeCase(columns[i].metadata.colName))
-                    else if (useCamelCase) dt.addColumn(common.toCamelCase(columns[i].metadata.colName))
-                    else  dt.addColumn(columns[i].metadata.colName)
-                }
-                headersRead = true
-            }
-            let dr = dt.newRow()
-            for ( let i=0; i< columns.length; i++) {
-                dr.items[i]=columns[i].value
-            }
-            dt.addRow(dr)
-        }) 
-        this.db.execSql(request)
-    }
+    getRealSql(queryObject) { return common.getRealSql(this, queryObject) }
 
     getObjectsCB(params, callback) {
         var ts = Date.now()
@@ -274,32 +193,28 @@ class Connection {
         this.db.execSql(request)
     }
 
-    getSingleObjectCB (params, callback) {
+    getSingleObjectCB(params, callback) {
         var ts = Date.now()
         var realSql = this.getRealSql(params); 
         var self = this
         var useSnakeCase = false
-        var useCamelCase = false        
+        var useCamelCase = false     
         if ( params.options ) {
             useSnakeCase = params.options.useSnakeCase || false
             useCamelCase = params.options.useCamelCase || false
         }
 
-        this.debug("getSingleObjectCB",realSql)
-        let dt = new data.DataTable
-        let headersRead = false        
-        let valueRead = false
+        this.debug("getObjects",realSql)
+        let ret = undefined
         let fields = []
-        let retVal
+        let headersRead = false
         let request = new mssql.Request(realSql, function(err, rows, fields)  {
             if (err) {
-                self.debug("getObject",'Error: '+err.code)
+                self.debug("getObjects",'Error: '+err.code)
                 then( function() {callback(err)}) 
             } else {
-                self.debug("getObject",'Completed in ' + (Date.now() -ts) + ' ms')
-                if (useSnakeCase) retVal = common.toSnakeCase(retVal) 
-                if (useCamelCase) retVal = common.toCamelCase(retVal)                 
-                if (isFunction(callback)) then( function() { callback(undefined, retVal) } )
+                self.debug("getObjects",'Completed in ' + (Date.now() -ts) + ' ms')
+                if (isFunction(callback)) then( function() { callback(undefined, ret) } )
             }
         })
         request.setTimeout( this.timeoutMilliSeconds ) 
@@ -314,12 +229,14 @@ class Connection {
             for ( let i=0; i< columns.length; i++) {
                 dr[fields[i]]=columns[i].value
             }
-            retVal = dr
-            valueRead = true
-        }) 
-        this.db.execSql(request)        
-    }    
+            if (useSnakeCase) dr = common.toSnakeCase(dr) 
+            if (useCamelCase) dr = common.toCamelCase(dr)   
+            
+            ret=dr
 
+        }) 
+        this.db.execSql(request)
+    }
 
     getListCB(params, callback) {
         var ts = Date.now()
@@ -389,32 +306,20 @@ class Connection {
         this.db.execSql(request)
     }       
 
-    getScalarCB(params, callback) {
-        var ts = Date.now()
-        var realSql = this.getRealSql(params); 
-        var self = this
-        this.debug("getScalar",realSql)
-        let dt = new data.DataTable
-        let valueRead = false
-        let retVal
-        let request = new mssql.Request(realSql, function(err, rows, fields)  {
-            if (err) {
-                self.debug("getScalar",'Error: '+err.code)
-                then( function() {callback(err)}) 
-            } else {
-                self.debug("getScalar",'Completed in ' + (Date.now() -ts) + ' ms')
-                if (isFunction(callback)) then( function() { callback(undefined, retVal) } )
-            }
-        })
-        request.setTimeout( this.timeoutMilliSeconds ) 
-        request.on('row', function(columns) { 
-            if (! valueRead ) {
-                retVal = columns[0].value
-                valueRead = true
+    getScalarCB ( params, callback ) {
+        this.getSingleObjectCB(params, 
+            function (err, res) {
+                if ( err ) callback (err) 
+                else if (res) {
+                    let keys = Object.keys(res)
+                    callback( undefined, res[keys[0]])
+                }
+                else {
+                    callback ( undefined, undefined )
+                }
             }
-        }) 
-        this.db.execSql(request)        
-    }
+        )        
+    }    
 
     execCB(params, callback) { 
         common.exec(this, params, callback) 

package/lib/driver_pgsql.js

@@ -1,6 +1,6 @@
 /********************************************************************************
  * driver_pgsql.js
- * PosgreSQL rdao driver
+ * PosgreSQL xardao driver
  * 
  * Author : Stephane Potelle 
  * Email  : stephane.potelle@gmail.com
@@ -13,7 +13,6 @@ try {
     console.error("Please add module \"pg\" to your package.json dependencies")
     process.exit(1)
 }
-var data = require('./datatable.js');
 var common = require ('./common.js');
 var ESNext = require('./esnext');
 
@@ -21,7 +20,7 @@ isFunction = common.isFunction;
 then = common.then;
 
 class Connection {
-    constructor() {
+    constructor(connUrlInfo) {
         this.debugMode = false;
         this.lastInsertId = null;
         this.lastStatementChanges = null;
@@ -29,9 +28,9 @@ class Connection {
         this.explicitReturnKey = true
         this.saveDatesAsUTC = true
         this.transactionLevel = 0
+        this.connUrlInfo=connUrlInfo
 
         this.open = ESNext(this.openCB, this)
-        this.getDataTable = ESNext(this.getDataTableCB, this)
         this.getObjects = ESNext(this.getObjectsCB, this)
         this.getSingleObject  = ESNext(this.getSingleObjectCB , this)
         this.getList = ESNext(this.getListCB, this)
@@ -44,12 +43,10 @@ class Connection {
         this.beginTrans = ESNext(this.beginTransCB, this)
         this.commitTrans = ESNext(this.commitTransCB, this)
         this.rollbackTrans = ESNext(this.rollbackTransCB, this)
-        this.forEachRow = ESNext(this.forEachRowCB, this)            
         this.close = ESNext(this.closeCB, this)
     }
 
     open() {}
-    getDataTable() {}
     getObjects() {}
     getSingleObject () {}
     getList() {}
@@ -66,14 +63,17 @@ class Connection {
     }
 
     openCB(dbInfo, callback) {
-        function postConnection(cn, sql, callback) {
-            if (typeof (sql) == "string" || Array.isArray(sql) ) cn.execCB(sql, callback)
-            else then( callback )
+        this.debug('open','Opening connection for PGSQL')
+        let connInfo
+        if (dbInfo) {
+            connInfo=dbInfo
+        } else {
+            connInfo= { host: this.connUrlInfo.hostname, user: this.connUrlInfo.username, password: this.connUrlInfo.password, database: this.connUrlInfo.database }
         }
 
-        this.db =  new pg.Client(dbInfo);
+        this.db =  new pg.Client(connInfo);
         this.debug('open','Opening connection for PostgresQL')
-        this.db.connect( function() { postConnection(this, dbInfo.initSql, callback) })
+        this.db.connect( callback )
     }
 
     batch() {
@@ -128,88 +128,6 @@ class Connection {
     mergeParams(sql, params) { return common.mergeParams(this, sql, params) }
     getRealSql(queryObject) { return common.getRealSql(this, queryObject) }
 
-    forEachRowCB(params, eachfunc, callback) {
-        var ts = Date.now();
-        var realSql = this.getRealSql(params); 
-        var self = this;
-        this.debug("forEachRow",realSql);
-
-        this.db.query(realSql, function(err,result)  {
-
-
-            function finish() {
-                self.debug("forEachRow",'Completed in ' + (Date.now() -ts) + ' ms');
-                if (isFunction(callback)) then( callback)             
-            }
-
-            if (err) {
-                self.debug("forEachRow",'Error: '+err.code);
-                then( function() {callback(err)}) ;
-            } else {
-                let r = 0
-                then( function populateTable() {
-                    if (r < result.rows.length) {
-                        eachfunc( result.rows[r], function( err) {
-                            r++
-                            then(populateTable)
-                        } ) 
-                    } else {
-                        finish()
-                    }
-                } )
-            }
-        })
-    }        
-
-    getDataTableCB(params, callback) {
-        var ts = Date.now();
-        var realSql = this.getRealSql(params); 
-        var self = this;
-        var useSnakeCase = false
-        var useCamelCase = false        
-        if ( params.options ) {
-            useSnakeCase = params.options.useSnakeCase || false
-            useCamelCase = params.options.useCamelCase || false
-        }
-
-        this.debug("getDataTable",realSql);
-        this.db.query(realSql, function(err, result)  {
-            let dt = new data.DataTable;
-
-            function finish() {
-                self.debug("getDataTable",'Completed in ' + (Date.now() -ts) + ' ms');
-                if (isFunction(callback)) then( function() { callback(undefined, dt) } );            
-            }
-
-            if (err) {
-                self.debug("getDataTable",'Error: '+err.code);
-                then( function() {callback(err)}) ;
-            } else {
-                let rows=result.rows;
-                if (rows.length > 0 ) {
-                    let cols = Object.keys(rows[0])
-                    for (let c = 0; c< cols.length; c++) {
-                        if (useSnakeCase) dt.addColumn(common.toSnakeCase(cols[c]))
-                        else if (useCamelCase) dt.addColumn(common.toCamelCase(cols[c]))
-                        else  dt.addColumn(cols[c])
-                    }                    
-                    let r = 0
-                    then( function populateTable() {
-                        if (r<rows.length) {
-                            dt.addRow( dt.newRow(rows[r]));
-                            r++
-                            then(populateTable)
-                        } else {
-                            finish()
-                        }
-                    } )
-                } else {
-                    finish()
-                }
-            }
-        });
-    }
-
     getObjectsCB(params, callback) {
         var ts = Date.now();
         var realSql = this.getRealSql(params); 
@@ -283,7 +201,7 @@ class Connection {
         var ts = Date.now();
         var realSql = this.getRealSql(params); 
         var self = this;
-        this.debug("getDataTable",realSql);
+        this.debug("getList",realSql);
         this.db.query(realSql, function(err,result)  {
             if (err) {
                 self.debug("getList",'Error: '+err.code);
@@ -358,7 +276,7 @@ class Connection {
         var ts = Date.now();
         var realSql = this.getRealSql(params); 
         var self = this;
-        this.debug("getDataTable",realSql);
+        this.debug("getScalar",realSql);
         this.db.query(realSql, function(err,result)  {
             if (err) {
                 self.debug("getScalar",'Error: '+err.code);

package/lib/driver_sqlite3.js

@@ -1,6 +1,6 @@
 /********************************************************************************
  * driver_sqlite3.js
- * Sqlite3 rdao driver
+ * Sqlite3 xardao driver
  * 
  * Author : Stephane Potelle 
  * Email  : stephane.potelle@gmail.com
@@ -13,7 +13,7 @@ try {
     console.error("Please add module \"sqlite3\" to your package.json dependencies")
     process.exit(1)
 }
-var data = require('./datatable.js');
+
 var common = require ('./common.js');
 var ESNext = require('./esnext');
 
@@ -33,7 +33,6 @@ class Connection {
 
 
         this.open = ESNext(this.openCB, this)
-        this.getDataTable = ESNext(this.getDataTableCB, this)
         this.getObjects = ESNext(this.getObjectsCB, this)
         this.getSingleObject  = ESNext(this.getSingleObjectCB , this)
         this.getList = ESNext(this.getListCB, this)
@@ -46,12 +45,10 @@ class Connection {
         this.beginTrans = ESNext(this.beginTransCB, this)
         this.commitTrans = ESNext(this.commitTransCB, this)
         this.rollbackTrans = ESNext(this.rollbackTransCB, this)         
-        this.forEachRow = ESNext(this.forEachRowCB, this)    
         this.close = ESNext(this.closeCB, this)
     }
 
     open() {}
-    getDataTable() {}
     getObjects() {}
     getSingleObject () {}
     getList() {}
@@ -133,123 +130,7 @@ class Connection {
     mergeParams(sql, params) { return common.mergeParams(this, sql, params) }
     getRealSql(queryObject) { return common.getRealSql(this, queryObject) }
 
-    forEachRowCB(params, eachfunc, callback) {
-        var ts = Date.now();
-        var realSql = this.getRealSql(params); 
-
-        var self = this;
-        this.debug("forEachRow",realSql);
-
-        this.db.configure("busyTimeout", this.timeoutMilliSeconds)
-        this.db.all(realSql, [], function(err,rows)  {
-            function finish() {
-                self.debug("forEachRow",'Completed in ' + (Date.now() -ts) + ' ms');
-                if (isFunction(callback)) then( function() { callback() } );            
-            }
-
-            if (err) {
-                self.debug("forEachRow",'Error: '+err.code);
-                then( function() {callback(err)}) ;
-            } else {
-                if (rows.length > 0 ) {
-                    
-                    let r = 0
-                    then( function populateTable() {
-                        if (r<rows.length) {
-                            eachfunc( rows[r], function() { 
-                                r++
-                                populateTable})
-                        } else {
-                            finish()
-                        }
-                    } )
-                    
-                } else {
-                    finish()
-                }
-            }
-        })
-    }
-
-
-    forEachRowCBSync(params, eachfunc, callback) {
-        var ts = Date.now();
-        var realSql = this.getRealSql(params); 
-        var self = this;
-        this.debug("forEachRow",realSql)
-
-        this.db.configure("busyTimeout", this.timeoutMilliSeconds)
-        this.db.each(realSql, [], 
-            function(err, row ) { 
-                if (!err) eachfunc(row, function(){}) 
-            }, 
-            function(err,rows){
-
-                function finish() {
-                    self.debug("forEachRow",'Completed in ' + (Date.now() -ts) + ' ms');
-                    if (isFunction(callback)) then( function() { callback() } );            
-                }
-
-                if (err) {
-                    self.debug("forEachRow",'Error: '+err.code);
-                    then( function() {callback(err)}) ;
-                } else {
-                    finish()
-                }
-            })
-    }        
-
-    getDataTableCB(params, callback) {
-        var ts = Date.now();
-        var realSql = this.getRealSql(params); 
-        var useSnakeCase = false
-        var useCamelCase = false        
-        if ( params.options ) {
-            useSnakeCase = params.options.useSnakeCase || false
-            useCamelCase = params.options.useCamelCase || false
-        }
-        var self = this;
-        this.debug("getDataTable",realSql);
-
-        this.db.configure("busyTimeout", this.timeoutMilliSeconds)        
-        this.db.all(realSql, [], function(err,rows)  {
-            let dt = new data.DataTable;
-
-            function finish() {
-                self.debug("getDataTable",'Completed in ' + (Date.now() -ts) + ' ms');
-                if (isFunction(callback)) then( function() { callback(undefined, dt) } );            
-            }
-
-            if (err) {
-                self.debug("getDataTable",'Error: '+err.code);
-                then( function() {callback(err)}) ;
-            } else {
-                if (rows.length > 0 ) {
-                    let cols = Object.keys(rows[0])
-                    for (let c = 0; c< cols.length; c++) {
-                        if (useSnakeCase) dt.addColumn(common.toSnakeCase(cols[c]))
-                        else if (useCamelCase) dt.addColumn(common.toCamelCase(cols[c]))
-                        else  dt.addColumn(cols[c])
-                    }
-                    
-                    let r = 0
-                    then( function populateTable() {
-                        if (r<rows.length) {
-                            dt.addRow( dt.newRow(rows[r]));
-                            r++
-                            then(populateTable)
-                        } else {
-                            finish()
-                        }
-                    } )
-                    
-                } else {
-                    finish()
-                }
-            }
-        });
-    }
-
+    
     getObjectsCB(params, callback) {
         var ts = Date.now();
         var realSql = this.getRealSql(params); 

package/lib/xardao.js

@@ -1,5 +1,5 @@
 /********************************************************************************
- * datatable.js
+ * xardao.js
  * data structure for SQL database interactions
  * 
  * Author : Stephane Potelle 
@@ -9,7 +9,6 @@
 const modCRUDAdapter = require ('./crud-adapter')
 const URL=require('url').URL
 
-exports.DataTable = require ('./datatable').DataTable
 exports.CRUDAdapter = modCRUDAdapter.CRUDAdapter
 
 function parseConnUrl(url) {
@@ -81,7 +80,7 @@ function Connection(url) {
           return cn 
       }                
         else {
-            throw new Error('Invalid RDAO driver name')
+            throw new Error('Invalid xardao driver name')
         }
     } catch(e) {
         console.log(e)
@@ -106,10 +105,6 @@ 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, 

package/package.json

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

package/xardao.code-workspace

@@ -3,6 +3,5 @@
 		{
 			"path": "."
 		}
-	],
-    "settings": {}
+	]
 }

package/lib/datatable.js

@@ -1,193 +0,0 @@
-/********************************************************************************
- * datatable.js
- * data structure for SQL database interactions
- * 
- * Author : Stephane Potelle 
- * Email  : stephane.potelle@gmail.com
-********************************************************************************/
-
-var ESNext = require('./esnext');
-
-class DataTable {
-    constructor(name) {
-        this.columns = [];
-        
-        this.rows = [];
-        this.colmap = {};
-        if (name != undefined ) this.tablename = name;
-        else this.tablename="";
-        this.JSONAsObjects = ESNext(this.JSONAsObjectsCB,this);
-        this.JSONAsTable = ESNext(this.JSONAsTableCB,this);
-        
-    }
-
-    // This function will re-create all internal associations
-    repair() {
-        this.refreshColmap;
-        for ( let i=0; i< this.rows.length; i++ ) {
-            this.rows[i].datatable = this;
-        }
-    }
-
-    JSONAsObjects() {} // This is just the function prototype
-    JSONAsTable() {} // This is just the function prototype
-
-    JSON() {
-        return JSON.stringify(this, (key,value) => {
-            if ( this &&  key == 'datatable' ) return undefined;
-            if ( this &&  key == 'colmap' ) return undefined;
-            return value;
-        });
-    }
-
-    JSONAsObjectsCB( pfirst, plast, callback ) {
-        let o = []
-        let first = pfirst || 0
-        let last = plast || -1
-        if ( plast < 0 )  plast = this.rows.length
-        this.forRange(first, last, function(row) {
-            o.push(JSON.stringify(row.toObject()))
-        }
-        , function() { 
-            let resp = '[' + o.join(',\n') + ']'
-            callback(undefined, resp)  
-        }) 
-    }
-
-    JSONAsTableCB( pfirst, plast, callback ) {
-        let me = this;
-        let o = []
-        let first = pfirst || 0
-        let last = plast || -1
-        if ( plast < 0 )  plast = this.rows.length
-        this.forRange(first, last, function(row) {
-            o.push(JSON.stringify(row.items))
-        }
-        , function() { 
-            let resp = '{"columns":'+ JSON.stringify(me.columns) + ',\n"rows": [' + o.join(',\n') + ']}'
-            callback(undefined, resp)  
-        }) 
-    }    
-
-    newRow(value) {
-        var r = new DataRow(this);
-        if ( value != undefined && typeof(value) == 'object') r.set(value);
-        return r;
-    }
-
-    addRow(r) {
-        this.rows.push(r)
-    }
-
-    delRow(n) {
-        this.rows.splice(n,1);
-    }
-
-    addColumn(colName, defaultValue = null){
-        if (this.getColumnIndex(colName) == undefined ) {
-            this.colmap[colName]=this.columns.length;
-            this.columns.push(colName)
-            for (let i=0; i< this.rows.length; i++) this.rows[i].items.push(defaultValue);
-        }
-    }
-
-    delColumn(colNameOrIndex) {
-        var cindex = this.getColumnIndex(colNameOrIndex);
-        if (cindex != undefined) {
-            this.columns.splice(cindex,1);
-            for (let i=0; i< this.rows.length; i++) this.rows[i].items.splice(cindex,1);;
-        }
-    }
-
-    refreshColmap() {
-        this.colmap = {};
-        for (let i = 0; i< this.columns.length; i++ ) {
-            this.colmap[this.columns[i]] = i;
-        }
-    }
-
-    getColumnIndex(colNameOrIndex) {
-        if (typeof(colNameOrIndex) == 'number') return colNameOrIndex;
-        else if (typeof(colNameOrIndex) == 'string') return this.colmap[colNameOrIndex];
-        else throw new Error('Invalid index');
-    }
-
-    forRange( first, last, block, next ) {
-        var i = first ;
-        var me=this;
-
-        if ( i < 0 ) i = 0;
-
-        function loop() {
-            if ( i< me.rows.length && ( i<=last || last < 0 )) {
-                block(me.rows[i]);
-                i++;
-                then(loop);
-            }
-            else then(next);
-        }
-
-        loop();
-    }
-
-    forEachRow(block, next) {
-        this.forRange(0,-1, block, next);
-    }
-
-    toArraySync(){
-        let a = []
-        for (let r = 0; r<this.rows.length; r++) {
-            a.push(this.rows[r].items)
-        }
-        return a
-    }
-
-    toArray(callback){
-        let a = []
-
-        forEachRow(function() { a.push(this.rows[r].items) }, function() { callback(a) })
-    }
-}
-
-class DataRow {
-    constructor(table) {
-        this.items = [];
-        this.datatable = table;
-        for (let i = 0; i< this.datatable.columns.length; i++ ) {
-            this.items.push(null);
-        }
-    }
-
-    get(index) {
-        return this.items[this.datatable.getColumnIndex(index)];
-    }
-
-    set(index, value) {
-        if ((typeof(index) == 'number' || typeof(index) == 'string' ) && value != undefined )
-            this.items[this.datatable.getColumnIndex(index)]=value;
-        else if ( typeof(index) == 'object' ) {
-            
-            let obj = index;
-            let keys = Object.keys(obj);
-            for ( let i = 0 ; i < keys.length; i ++ ){
-                let k = keys[i];
-                let ix;
-                if ( ( ix = this.datatable.getColumnIndex(k)) !=undefined ){
-                    this.items[ix] = obj[k];
-                }
-            }
-        }
-    }
-
-    toObject() {
-        let ret = {};
-        for (let i=0 ; i < this.datatable.columns.length; i++) {
-            ret[this.datatable.columns[i]] = this.items[i];
-        }
-        return ret;
-    }
-
-}
-
-exports.DataRow = DataRow;
-exports.DataTable = DataTable;