xardao 1.1.20 → 1.2.3

package/README.md

@@ -1,202 +1,4 @@
-
 # xardao
---------
-## Overview
-
 Xardao Asynchronous Relational Database Access Object
 
-A library to standardize datadase interface in Node without obscuring SQL.
-Currently supports SQLite, MariaDB (mysql), PostgreSQL, SQL server
-
-The library is fully asynchronous and all functions can be used both as for promise-style of callback-style calls.
-
-```javascript
-   // Callback style
-   cn.getObjects ("select * from mytable", function(err, arrayOfObject) { do something ...} )
-
-   // Promise style
-   try {
-      arrayOfObject = await cn.getObjects ("select * from mytable")
-      do something ...
-   } catch(e) {
-      // in case there is an error
-   } 
-```
-
-It provides the basic functions of a database driver through the same interface for all databases:
-
-* Read query result to an object
-* Read a set of rows to a data table or array of objects
-* Read a single value
-* Execute SQL statement, either individually or sequentially
-
-It also provides a base CRUD adapter that can be used as the foundation for creating business objects
-
-The package DOES NOT specify the original driver as dependencies. This is done on purpose bacause you 
-generally use only one type of database in your project. 
-
-The underlying database driver module must be added as a module dependency.
-
-## API
-
-### Class Connection
-
-#### Opening a connection
-Before you connect to a database engine, you need to get an instance of *Connection*.
-It is not recommended to instanciate it using the "new" keyword from the driver class.
-
-Instead you should use the *Connection* function from the xardao namespace.
-
-```javascript
-const xardao = require ('../lib/xardao.js'); 
-
-cn = xardao.Connection('sqlite')
-```
-
-The Connection function accepts the following values as driver name:
-
-* 'sqlite' or 'sqlite3'
-* 'mysql' or 'mariadb'
-* 'pg' or 'pgsql' or 'postgres'
-* 'ms' or 'mssql'
-
- 
-
-#### One-line query specification
-Most functions need a first parameter *query* that will indicates the SQL to be executed by the database engine. 
-XARDAO provides a common method for passing SQL parameters to the underlying database engine.
-Query may be one of the following:
-
-* A SQL statement as a string
-* An object with 2 or 3 attributes: 
-     * *sql* : a string containing a SQL statement. Query parameters are prefixed with "@"
-     * *params*: an object whose attributes are named after the parameters specified in *sql* (Without "@" prefix)
-     * *options*: options to modify the function behavior
-
-#####Example
-```javascript
-    await cn.exec ({ 
-            sql: "insert into contacts(first_name, last_name) values (@firstName, @lastName) ",
-            params: {
-                firstName: "John",
-                lastName: "Smith"
-            }
-          })
-```
-
-
-#### Opening and closing 
-##### Connection#open( spec, [callback] )
-Opens a database connection. *spec* is the database connection specification and is specific to the database driver chosen. 
-Refer to each driver documentation for details. *Callback* is optional, but needed when using callback style.
-
-##### Connection#close( [callback] )
-Closes a database connection.
-*Callback* is optional, but needed when using callback style.
-
-#### Reading
-##### Connection#getObjects( query, [callback] )
-Runs the *query* and returns an array of objects, one for each row.
-*Callback* is optional, but needed when using callback style.
-
-##### Connection#getSingleObject( query, [callback] )
-Runs the *query* and returns the first row as an object.
-*Callback* is optional, but needed when using callback style.
-
-##### Connection#getDataTable( query, [callback] )
-Runs the *query* and returns the results as a datatable object.
-*Callback* is optional, but needed when using callback style.
-
-##### Connection#getScalar( query, [callback] )
-Runs the *query* and returns the first field of the first row as single value.
-*Callback* is optional, but needed when using callback style.
-
-##### Connection#getList( query, [callback] )
-Runs the *query* and returns the results as a array of scalar values containing only the fist column of each row.
-*Callback* is optional, but needed when using callback style.
-
-##### Connection#getKVList( query, [callback] )
-Runs the *query* and returns the results as a an object. The first column is the Key and the second column is the value.
-*Callback* is optional, but needed when using callback style.
-
-##### Connection#forEachRow( query, eachRowFunc, [callback] )
-
-#### Updating
-##### Connection#execSingle( query, [callback] )
-Executes a single query.
-*Callback* is optional, but needed when using callback style.
-
-##### Connection#execMultiple( arrayOfQueries, [callback] )
-Executes multiple queries in a sequence.
-*Callback* is optional, but needed when using callback style.
-
-##### Connection#exec( queryOrArrayOfQueries, [callback] )
-Provides a unique function for single and multiple queries. Act as an alias for *execSingle* or *execMultiple*, depending on the type of the first parmameter.
-
-#### Working with transactions
-The transaction methods provide a common wait of managing transactions.
-
-##### Connection#beginTrans()
-Starts a transaction 
-
-##### Connection#commitTrans()
-Commits current transaction. If no transaction is in progress, this call has no effect.
-
-##### Connection#rollbackTrans()
-Rolls back current transaction. If no transaction is in progress, this call has no effect.
-
-
-### Class Datatable
-This class provides a storage structure for the results. The columns and rows are stored separately which give the advantage that the columns information is available event of the resultset has no rows.
-
-The Datatable object has the structure below:
-
-```javascript
-    {
-        columns: [], // Each columns is a string 
-        rows: []     // Each row is an array of values, in the same order as the columns
-    }
-```
-
-*_Note_* The use of datatables may be deprecated in future releases.
-
-### Integration with ExpressJS
-
-In an web server context, each page call requires an isolated connection. It then becomes necessary to ensure that connections always get closed after each HTTP request.
-
-Xardao provides 2 methods to ensure that the open connection will always be closed:
-
-+ A decorator function to use in the router
-+ A connection opener function
-
-#### xardao.express.usingDBConnection(connSpec, controller)
-"Decorates"  the function *Controller* by adding an open connection to request object.
-
-```javascript
-    // In the router:
-
-    routes.get('/dtjson',   xardao.express.usingDBConnection(connSpec, controllers.dtjson))
-
-    // In the controller, simply use the connection:
-
-    req.conn.getDataTable('select * from assets', function(err, dt) {
-      if (!err) {
-        dt.className ='basic-table'
-        res.render('dt', { title: 'Express', hitcount: req.session.hitcount, tbl: dt })
-        next()
-      }
-      next(err)
-    })
-```
-
-#### xardao.express.connect(connSpec, req, res)
-Returns the connection specified by *connSpec*. A listener to the 'finish' event of the response is 
-added to guarantee that the connection will always be closed, so there is no need to write specific code
-to ensure proper connection closing.
-
-```javascript
-    // In the controller
-
-    let conn = await xardao.express.connect(req.appconfig.database, req, res)
-
-```
+See https://stefpo.github.io/node-xardao/

package/lib/driver_mariadb.js

@@ -22,13 +22,14 @@ isFunction = common.isFunction;
 then = common.then;
 
 class Connection {
-    constructor() {
+    constructor(connUrlInfo) {
         this.debugMode = false;
         this.lastInsertId = null;
         this.lastStatementChanges = null;
         this.timeoutMilliSeconds = 10000;
         this.saveDatesAsUTC = true
         this.transactionLevel = 0
+        this.connUrlInfo=connUrlInfo
 
         this.open = ESNext(this.openCB,this)
         this.getDataTable = ESNext(this.getDataTableCB,this)
@@ -66,14 +67,10 @@ 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.db =  new mysql.createConnection(dbInfo);
+        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})
         this.debug('open','Opening connection for MariaDB')
-        this.db.connect( function() { postConnection(this, dbInfo.initSql, callback) })
+        this.db.connect( callback )
     }
 
     batch() {

package/lib/driver_mssql.js

@@ -22,13 +22,14 @@ isFunction = common.isFunction
 then = common.then
 
 class Connection {
-    constructor() {
+    constructor(connUrlInfo) {
         this.debugMode = false
         this.lastInsertId = null
         this.lastStatementChanges = null
         this.timeoutMilliSeconds = 10000
         this.saveDatesAsUTC = true
         this.transactionLevel = 0
+        this.connUrlInfo=connUrlInfo
 
         this.open = ESNext(this.openCB, this)
         this.getDataTable = ESNext(this.getDataTableCB, this)
@@ -66,22 +67,28 @@ class Connection {
     }
 
     openCB(dbInfo, callback) {
-        let me = this 
-        function postConnection(cn, sql, callback) {
-            if (dbInfo.options.requestTimeout) me.timeoutMilliSeconds = dbInfo.options.requestTimeout
-            if (typeof (sql) == "string" || Array.isArray(sql) ) cn.execCB(sql, callback)
-            else then( callback )
-        }
-
         this.debug('open','Opening connection for MSSQL')
-        
-        dbInfo.options.validateBulkLoadParameters = dbInfo.options.validateBulkLoadParameters == undefined ? false : dbInfo.options.validateBulkLoadParameters
-        this.db =  new mssql.Connection(dbInfo)
-        this.db.connect(  function(err) { 
-            if (err) callback(err) 
-            else 
-                postConnection(this, dbInfo.initSql, callback)
-            } )
+        let connInfo
+        if (dbInfo) {
+            connInfo=dbInfo
+        } else  {
+            connInfo= { server: this.connUrlInfo.hostname, 
+                      authentication: { type: 'default', options: { userName: this.connUrlInfo.username, password: this.connUrlInfo.password } },
+                      options: { database: this.connUrlInfo.database || 'master' }
+                    }
+
+            for (let o in this.connUrlInfo.options ) {
+                let v=this.connUrlInfo.options[o]
+                
+                if (v=='true') connInfo.options[o] = true
+                else if (v=='false') connInfo.options[o] = false
+                else if (! isNaN ( parseInt(v))) connInfo.options[o] = parseInt(v)
+                else connInfo.options[o] = v
+            }
+        }
+        connInfo.options.validateBulkLoadParameters = connInfo.options.validateBulkLoadParameters == undefined ? false : connInfo.options.validateBulkLoadParameters
+        this.db =  new mssql.Connection(connInfo)
+        this.db.connect(callback)
     }
 
 
@@ -409,7 +416,9 @@ class Connection {
         this.db.execSql(request)        
     }
 
-    execCB(params, callback) { common.exec(this, params, callback) }
+    execCB(params, callback) { 
+        common.exec(this, params, callback) 
+    }
     execMultipleCB(queries, callback) { common.execMultiple(this, queries, callback) }
 
     execSingleCB(params, callback) {
@@ -421,13 +430,13 @@ class Connection {
         let request = new mssql.Request(realSql, function(err, rowcount, rows)  {
             if (err) { 
                 self.debug("execSingle",'Error: '+err.code)
-                then( function() {callback(err)}) 
+                then( function() { callback(err) }) 
             }
             else { 
                 //self.lastInsertId = 0 //if (result.insertId > 0) self.lastInsertId = result.insertId
                 //self.lastStatementChanges = 0 //result.affectedRows
                 self.debug("execSingle",'Completed in ' + (Date.now() -ts) + ' ms LastId: ' + self.lastInsertId + ' Changes: ' + self.lastStatementChanges)
-                then(callback)
+                then( callback )
             }
         })
         request.setTimeout( this.timeoutMilliSeconds ) 

package/lib/driver_sqlite3.js

@@ -21,7 +21,7 @@ isFunction = common.isFunction;
 then = common.then;
 
 class Connection {
-    constructor() {
+    constructor(connUrlInfo) {
         this.debugMode = false;
         this.lastInsertId = null;
         this.lastStatementChanges = null;
@@ -29,6 +29,8 @@ class Connection {
         this.saveDatesAsUTC = true
         this.pooled = false
         this.transactionLevel = 0
+        this.connUrlInfo=connUrlInfo
+
 
         this.open = ESNext(this.openCB, this)
         this.getDataTable = ESNext(this.getDataTableCB, this)
@@ -65,19 +67,16 @@ class Connection {
        if (this.debugMode) console.error(f + ": " + s)
     }
 
-    openCB(dbInfo, callback) {
-        function postConnection(cn, sql, callback) {
-            if (typeof (sql) == "string" || Array.isArray(sql) ) cn.execCB(sql, callback)
-            else then( callback )
-        }
-
+    openCB(pDbInfo, callback) {
+        let dbInfo = pDbInfo || this.connUrlInfo.database
+        
         try {
             let dbfile = undefined
             if (typeof(dbInfo) == "string" ) dbfile = dbInfo
             else if (dbInfo.database) dbfile = dbInfo.database
             this.db =  new sq3.Database(dbfile);
             this.debug('open','Opening connection for SQLite3')
-            postConnection(this, dbInfo.initSql, callback)
+            then( callback )
         } catch (e) {
             then( function() { callback(e) }  );
         }

package/lib/esnext.js

@@ -12,11 +12,16 @@ var util = require('util');
 function ESNext(f, obj) {
     const fp = util.promisify(f)
     return function(...args) {
-        if (typeof (args[args.length-1])=='function' && args.length == f.length)  
+        if (typeof (args[args.length-1])=='function' && args.length == f.length) {
+            //console.log(`${f.name}(${JSON.stringify(args)})`)
             f.apply(obj, args)
-        else 
+        } else {
+            while (args.length < fp.length-1) args.push(undefined)
+            //console.log(`async ${f.name}(${JSON.stringify(args)})`)
             return fp.apply(obj, args)
+        }
     }
 }
 
+
 module.exports = ESNext

package/lib/xardao.js

@@ -6,16 +6,51 @@
  * Email  : stephane.potelle@gmail.com
 ********************************************************************************/
 
-modCRUDAdapter = require ('./crud-adapter')
+const modCRUDAdapter = require ('./crud-adapter')
+const URL=require('url').URL
+
 exports.DataTable = require ('./datatable').DataTable
 exports.CRUDAdapter = modCRUDAdapter.CRUDAdapter
 
-function Connection(driver) {
+function parseConnUrl(url) {
+    try {
+      let tUrl=new URL(url)
+      tUrl.options={}
+      for (const [name, value] of tUrl.searchParams) {
+        tUrl.options[name]=value
+      }
+      let pp=tUrl.pathname.substring(1).split("/")
+      
+      return {
+        url:        url,
+        protocol:   tUrl.protocol,
+        hostname:   tUrl.hostname,
+        port:       tUrl.port,
+        username:   decodeURIComponent(tUrl.username),
+        password:   decodeURIComponent(tUrl.password),
+        pathname:   tUrl.pathname,
+        database:   pp[0],
+        schema:     pp.length >1  ? pp[1] : undefined,
+        options:    tUrl.options
+      }
+    } 
+    catch(e){ return undefined }
+  }
+
+function Connection(url) {
     let Conn 
+    let driver
+    let connInfo = parseConnUrl(url)
+    if (connInfo) { 
+        driver = connInfo.protocol.substring(0,connInfo.protocol.length-1) 
+    }
+    else driver=url
+    
+
     try {
         if (driver == 'mysql' || driver == 'mariadb') { 
             if ( Conn == undefined ) Conn = require ('./driver_mariadb').Connection
-            let cn = new Conn()
+            let cn = new Conn(connInfo)
             cn.createCRUDAdapter = function(table, pk) {
                 return modCRUDAdapter.createCRUDAdapter(this, table, pk)
             }
@@ -23,7 +58,7 @@ function Connection(driver) {
         }
         else if (driver == 'sqlite' || driver == 'sqlite3') { 
             if ( Conn == undefined ) Conn = require ('./driver_sqlite3').Connection
-            let cn = new Conn() 
+            let cn = new Conn(connInfo) 
             cn.createCRUDAdapter = function(table, pk) {
                 return modCRUDAdapter.createCRUDAdapter(this, table, pk)
             }
@@ -31,7 +66,7 @@ function Connection(driver) {
         }
         else if (driver == 'pg' || driver == 'pgsql' || driver == 'postgres') { 
             if ( Conn == undefined ) Conn = require ('./driver_pgsql').Connection
-            let cn = new Conn() 
+            let cn = new Conn(connInfo) 
             cn.createCRUDAdapter = function(table, pk) {
                 return modCRUDAdapter.createCRUDAdapter(this, table, pk)
             }
@@ -39,7 +74,7 @@ function Connection(driver) {
         }
         else if (driver == 'ms' || driver == 'mssql') { 
           if ( Conn == undefined ) Conn = require ('./driver_mssql').Connection
-          let cn = new Conn() 
+          let cn = new Conn(connInfo) 
           cn.createCRUDAdapter = function(table, pk) {
               return modCRUDAdapter.createCRUDAdapter(this, table, pk)
           }
@@ -92,11 +127,17 @@ exports.express.usingDBConnection = function usingDBConnection(connSpec, page )
 
 exports.express.connect = async function connect(config, req, res) {
     let conn 
+    let connUrlInfo = parseConnUrl(config)
     try {
-        conn = Connection(config.driver)
-        conn.debugMode = config.debugMode || false
-
-        await conn.open(config.dbInfo)
+        if (connUrlInfo==undefined) {
+            conn = Connection(config.driver)
+            conn.debugMode = config.debugMode || false
+            await conn.open(config.dbInfo)
+        } else  {
+            conn = Connection(config)
+            conn.debugMode = config.debugMode || false
+            await conn.open()            
+        }
         
         res.on("finish", 
             function() { 

package/package.json

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

package/xardao.code-workspace

@@ -0,0 +1,7 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	]
+}

package/examples/demo_xardao_mariadb.js

@@ -1,134 +0,0 @@
-/********************************************************************************
- * test_dbao_sqlite3.js
- * Test and demo Sqlite3 dao library
- * 
- * Author : Stephane Potelle 
- * Email  : stephane.potelle@gmail.com
-********************************************************************************/
-
-var rdao = require ('../lib/xardao.js'); 
-var promisify = require('util').promisify;
-
-cn = new rdao.Connection('mariadb');
-
-function logError(e) {
-    console.log('Error '+ e)
-}
-
-process.on('unhandledRejection', function(err) {
-    logError('unhandledRejection:' + err.stack);
-});
-
-/* Example of creating a business object 
-   as a part of the model */
-
-function createContactBO(conn) {
-    let bo = conn.createCRUDAdapter('contact','Id')
-    
-    bo.updateValidate = function (p, callback ){
-        if ( p.Age  >= 63 ) callback(new Error("Age must be lower than 63"))
-        else callback()
-    }
-
-    bo.createValidate = bo.updateValidate 
-
-    return bo
-}
-
-/* Example of using a combination of database commands 
-   and CRUD operations to perform database operations */
-async  function test1() {
-    let retErr 
-    try {
-        await cn.open({ host: 'localhost', user: 'root', password: 'xenon21', database: 'apptest'})
-        //await cn.exec('start transaction')
-        cn.beginTrans()
-        await cn.exec('drop table if exists contact')
-        await cn.exec(`create table contact ( 
-            Id int primary key auto_increment, 
-            Firstname varchar(50), 
-            Lastname varchar(50), 
-            Birthdate datetime , 
-            Email varchar(80),
-            Age int)`)
-
-        let contactBO=createContactBO(cn) 
-        
-        let tli = await contactBO.create({
-                Firstname: 'James', 
-                Lastname: 'O\'Connor', 
-                Birthdate: new Date(1957,7,9,12,0,0), 
-                Age: 62 } )
-        console.log(`Inserted ID #${tli}`)
-        console.log( JSON.stringify(contactBO.content))                
-        for (let i=0; i<10; i++) {                     
-            await contactBO.create({
-                    Firstname: 'John'+i, 
-                    Lastname: 'Doe-'+i, 
-                    Birthdate: new Date(2001,5,8, 18,0,0), 
-                    Age: 18                   
-                })
-        }
-
-        await contactBO.update({Id:2, Age: 57})
-        cn.commitTrans()
-
-        let o = await contactBO.read(2)
-        console.log( JSON.stringify(o))
-        console.log( JSON.stringify(contactBO.content))
-
-        contactBO.content.Age=23
-        await contactBO.update(undefined)
-        o = await contactBO.read(2)
-        console.log( JSON.stringify(o))
-
-        await contactBO.delete(2)
-
-        console.log(`Last insert Id: ${cn.lastInsertId}`)
-        
-        let dt = await cn.getDataTable("select * from contact")
-        console.log( dt.JSON())
-
-        console.log("OBJECTS")
-        let oc = await cn.getObjects("select * from contact")
-        console.log( JSON.stringify(oc,undefined,4)) 
-
-        let age = await cn.getScalar( { sql:"select age from contact where Firstname=@Firstname", params: { 'Firstname': 'James' } } )
-        console.log( age )
-        let kv = await cn.getKVList( "select Firstname, Lastname from contact" )   
-        console.log( JSON.stringify(kv))
-
-        console.log("Single object")
-        let so = await cn.getSingleObject ( "select * from contact where 1=0" )   
-        console.log( JSON.stringify(so))       
-
-        console.log("Adding 5000 rows")
-        await cn.beginTrans()
-        contactBO.createValidate = contactBO.defaultCreateValidate
-        for ( let i = 0; i < 5; i++  ) {
-            await contactBO.create({
-                Firstname: 'John'+i, 
-                Lastname: 'Doe-'+i, 
-                Birthdate: new Date(2001,5,8, 18,0,0), 
-                Age: 18                   
-            })            
-        }
-        await cn.commitTrans()
-        console.log("Done")        
-
-        console.log("Eachrow")
-        await cn.forEachRow( "select * from contact", function(row, callback ) {
-            console.log(JSON.stringify(row))
-            callback()
-        })     
-
-    } catch(err) {
-        console.log(err)
-        retErr = err
-    } finally {
-        await cn.close()
-    }
-} 
-
-test1()
-

package/examples/demo_xardao_mssql.js

@@ -1,147 +0,0 @@
-/********************************************************************************
- * test_dbao_mssql.js
- * Test and demo MSSQL dao library
- * 
- * Author : Stephane Potelle 
- * Email  : stephane.potelle@gmail.com
-********************************************************************************/
-
-var rdao = require ('../lib/xardao.js'); 
-var promisify = require('util').promisify;
-
-cn = new rdao.Connection('mssql');
-
-function logError(e) {
-    console.log('Error '+ e)
-}
-
-process.on('unhandledRejection', function(err) {
-    logError('unhandledRejection:' + err.stack);
-});
-
-/* Example of creating a business object 
-   as a part of the model */
-
-function createContactBO(conn) {
-    let bo = conn.createCRUDAdapter('contact','Id')
-    
-    bo.updateValidate = function (p, callback ){
-        if ( p.Age  >= 63 ) callback(new Error("Age must be lower than 63"))
-        else callback()
-    }
-
-    bo.createValidate = bo.updateValidate 
-
-    return bo
-}
-
-/* Example of using a combination of database commands 
-   and CRUD operations to perform database operations */
-async function test1(next) {
-    let retErr 
-    try {
-        let contactBO=createContactBO(cn) 
-        await cn.open({ server: 'localhost', 
-                            authentication: { type: 'default',
-                                options: { userName: 'sa', password: 'Xenon21$'} },
-                            options: { encrypt:false, database: 'master'}}
-                            )
-        try {
-               await cn.exec("CREATE DATABASE apptest")
-        } catch (e) {
-            console.log(e.message)
-        }
-        await cn.exec("USE apptest")
-//        await cn.close() 
-        /*await cn.open({ server: 'localhost', 
-                            authentication: { type: 'default',
-                                options: { userName: 'sa', password: 'Xenon21$'} },
-                            options: { encrypt:false, database: 'apptest'}}
-                            )*/
-        await cn.exec('if exists ( select * from sys.tables where name=\'contact\') drop table contact')
-        await cn.exec('create table contact( Id integer primary key identity, Firstname varchar(50), Lastname varchar(50), Birthdate datetime, Age int)')
-        await cn.beginTrans()
-        let tli = await contactBO.create({
-                Firstname: 'James', 
-                Lastname: 'O\'Connor', 
-                Birthdate: new Date(1957,7,9, 12,0,0), 
-                Age: 62 } )
-        console.log(`Inserted ID #${tli}`)
-        console.log( JSON.stringify(contactBO.content))                
-        for (let i=0; i<10; i++) {                     
-            await contactBO.create({
-                    Firstname: 'John'+i, 
-                    Lastname: 'Doe-'+i, 
-                    Birthdate: new Date(2001,5,8,18,0,0), 
-                    Age: 18                   
-                })
-        }
-
-        await contactBO.update({Id:2, Age: 57})
-        await cn.commitTrans()
-
-        let o = await contactBO.read(2)
-        console.log( JSON.stringify(o))
-        console.log( JSON.stringify(contactBO.content))
-
-        contactBO.content.Age=23
-        await contactBO.update(undefined)
-        o = await contactBO.read(2)
-        console.log( JSON.stringify(o))
-
-        await contactBO.delete(2)
-
-        console.log(`Last insert Id: ${cn.lastInsertId}`)
-        
-        let dt = await cn.getDataTable("select * from contact")
-        console.log( dt.JSON())
-
-        console.log("OBJECTS")
-        let oc = await cn.getObjects("select * from contact")
-        console.log( JSON.stringify(oc,undefined,4))    
-
-        let age = await cn.getScalar( { sql:"select age from contact where Firstname=@Firstname", params: { 'Firstname': 'James' } } )
-        console.log( age )
-        let kv = await cn.getKVList( "select Firstname, Lastname from contact" )   
-        console.log( JSON.stringify(kv))
-
-        console.log("Single object")
-        let so = await cn.getSingleObject ( "select * from contact" )   
-        console.log( JSON.stringify(so))     
-        
-        console.log("Adding 5000 rows")
-        await cn.beginTrans()
-        contactBO.createValidate = contactBO.defaultCreateValidate
-        for ( let i = 0; i < 5000; i++  ) {
-            await contactBO.create({
-                Firstname: 'John'+i, 
-                Lastname: 'Doe-'+i, 
-                Birthdate: new Date(2001,5,8, 18,0,0), 
-                Age: 18                   
-            })            
-        }
-        await cn.commitTrans()
-        console.log("Done")        
-        
-        console.log("Eachrow")
-        await cn.forEachRow( "select * from contact", function(row, callback ) {
-            console.log(JSON.stringify(row))
-            callback()
-        })            
-
-    } catch(err) {
-        console.log(err.stack)
-        retErr = err
-    } finally {
-        await cn.close()
-    }
-    if(next) next(retErr)
-}
-
-test1Async = promisify (test1)
-
-
-
-test1();
-
-

package/examples/demo_xardao_pgsql.js

@@ -1,135 +0,0 @@
-/********************************************************************************
- * test_dbao_sqlite3.js
- * Test and demo Sqlite3 dao library
- * 
- * Author : Stephane Potelle 
- * Email  : stephane.potelle@gmail.com
-********************************************************************************/
-
-
-var rdao = require ('../lib/xardao.js'); 
-var promisify = require('util').promisify;
-
-cn = new rdao.Connection('pg');
-
-function logError(e) {
-    console.log('Error '+ e)
-}
-
-process.on('unhandledRejection', function(err) {
-    logError('unhandledRejection:' + err.stack);
-});
-
-/* Example of creating a business object 
-   as a part of the model */
-
-function createContactBO(conn) {
-    let bo = conn.createCRUDAdapter('contact','id')
-    
-    bo.updateValidate = function (p, callback ){
-        if ( p.Age  >= 63 ) callback(new Error("Age must be lower than 63"))
-        else callback()
-    }
-
-    bo.createValidate = bo.updateValidate 
-
-    return bo
-}
-
-/* Example of using a combination of database commands 
-   and CRUD operations to perform database operations */
-async function test1(next) {
-    let retErr 
-    try {
-        let contactBO=createContactBO(cn) 
-        await cn.open({ host: 'localhost', user: 'apptestusr', password: 'apptestpw', database: 'apptest'})
-        await cn.beginTrans()
-        await cn.exec('drop table if exists contact')
-        await cn.exec('create table contact( id serial primary key, firstname varchar(50), lastname varchar(50), birthdate timestamp, age int)')
-        let tli = await contactBO.create({
-                firstname: 'James', 
-                lastname: 'O\'Connor', 
-                birthdate: new Date(1957,7,9, 12,0,0), 
-                age: 62 } )
-        console.log(`Inserted ID #${tli}`)
-        console.log( JSON.stringify(contactBO.content))
-        for (let i=0; i<10; i++) {                     
-            await contactBO.create({
-                    firstname: 'John'+i, 
-                    lastname: 'Doe-'+i, 
-                    birthdate: new Date(2001,5,8,18,0,0), 
-                    age: 18                   
-                })
-        }
-
-        await contactBO.update({id:2, age: 57})
-        await cn.commitTrans()
-
-        let o = await contactBO.read(2)
-        console.log( JSON.stringify(o))
-        console.log( JSON.stringify(contactBO.content))
-
-        contactBO.content.Age=23
-        await contactBO.update(undefined)
-        o = await contactBO.read(2)
-        console.log( JSON.stringify(o))
-
-        await contactBO.delete(2)
-
-        console.log(`Last insert Id: ${cn.lastInsertId}`)
-        
-        let dt = await cn.getDataTable("select * from contact")
-        console.log( dt.JSON())
-
-        console.log("OBJECTS")
-        let oc = await cn.getObjects("select * from contact")
-        console.log( JSON.stringify(oc,undefined,4))        
-
-        let age = await cn.getScalar( { sql:"select age from contact where Firstname=@Firstname", params: { 'Firstname': 'James' } } )
-        console.log( age )
-        let kv = await cn.getKVList( "select Firstname, Lastname from contact" )   
-        console.log( JSON.stringify(kv))
-
-        console.log("Single object")
-        let so = await cn.getSingleObject ( "select * from contact" )   
-        console.log( JSON.stringify(so))
-
-
-        console.log("Adding 5000 rows")
-        
-        await cn.beginTrans()
-        contactBO.createValidate = contactBO.defaultCreateValidate
-        for ( let i = 0; i < 5000; i++  ) {
-            await contactBO.create({
-                firstname: 'John'+i, 
-                lastname: 'Doe-'+i, 
-                birthdate: new Date(2001,5,8,18,0,0), 
-                age: 18                   
-            })      
-        }
-        await cn.commitTrans()
-        console.log("Done")   
-            
-
-        console.log("Eachrow")
-        await cn.forEachRow( "select * from contact", function( row, callback ) {
-            console.log(JSON.stringify(row))
-            callback()
-        })        
-
-    } catch(err) {
-        console.log(err)
-        retErr = err
-    } finally {
-        await cn.close()
-    }
-    if(next) next(retErr)
-}
-
-test1Async = promisify (test1)
-
-
-
-test1();
-
-

package/examples/demo_xardao_sqlite3.js

@@ -1,140 +0,0 @@
-/********************************************************************************
- * test_dbao_sqlite3.js
- * Test and demo Sqlite3 dao library
- * 
- * Author : Stephane Potelle 
- * Email  : stephane.potelle@gmail.com
-********************************************************************************/
-
-var rdao = require ('../lib/xardao.js'); 
-const promisify = require('util').promisify
-
-cn = rdao.Connection('sqlite')
-
-const sleep = promisify ( function (t, callback ) { setTimeout(callback, t)} )
-
-function logError(e) {
-    console.log('Error '+ e)
-}
-
-process.on('unhandledRejection', function(err) {
-    logError('unhandledRejection:' + err.stack);
-});
-
-/* Example of creating a business object 
-   as a part of the model */
-
-function createContactBO(conn) {
-    let bo = conn.createCRUDAdapter('contact','Id')
-    
-    bo.updateValidate = function (p, callback ){
-        console.log("updateValidate: "+JSON.stringify(this.content))
-        if ( p.Age  >= 63 ) callback(new Error("Age must be lower than 63"))
-        else callback()
-    }
-
-    bo.createValidate = bo.updateValidate 
-
-    return bo
-}
-
-/* Example of using a combination of database commands 
-   and CRUD operations to perform database operations */
-async function test1(next) {
-    let retErr 
-    try {
-        let contactBO=createContactBO(cn) 
-        await cn.open({ database: "test_database.sqlite",
-                        initSql: [ "PRAGMA foreign_keys = '1';",
-                                   "PRAGMA autovacuum = '1';"] })
-
-        await cn.beginTrans()
-        await cn.exec('drop table if exists contact')
-        await cn.exec('create table contact( Id integer primary key autoincrement, Firstname varchar(50), Lastname varchar(50), Birthdate timestamp, Age int)')
-        let tli = await contactBO.create({
-                Firstname: 'James', 
-                Lastname: 'O\'Connor', 
-                Birthdate: new Date(1957,7,9, 12,0,0), 
-                Age: 62 } )
-        console.log(`Inserted ID #${tli}`)
-        console.log( JSON.stringify(contactBO.content))   
-        await contactBO.read(undefined)
-        console.log( JSON.stringify(contactBO.content))           
-        for (let i=0; i<10; i++) {                     
-            await contactBO.create({
-                    Firstname: 'John'+i, 
-                    Lastname: 'Doe-'+i, 
-                    Birthdate: new Date(2001,5,8, 18,0,0), 
-                    Age: 18                   
-                })
-        }
-
-        await contactBO.update({Id:2, Age: 57})
-        await cn.commitTrans()
-
-        let o = await contactBO.read(2)
-        console.log( JSON.stringify(o))
-        console.log( JSON.stringify(contactBO.content))
-
-        contactBO.content.Age=23
-        await contactBO.update(undefined)
-        o = await contactBO.read(2)
-        console.log( JSON.stringify(o))
-
-        await contactBO.delete(2)
-
-        console.log(`Last insert Id: ${cn.lastInsertId}`)
-        
-        let dt = await cn.getDataTable( { sql: "select * from contact", options: { useSnakeCase: true }  })
-        console.log( dt.JSON())
-
-        console.log("OBJECTS")
-        let oc = await cn.getObjects( { sql: "select * from contact", options: { useSnakeCase: true }  })
-        console.log( JSON.stringify(oc,undefined,4))        
-
-        let age = await cn.getScalar( { sql:"select age from contact where Firstname=@Firstname", params: { 'Firstname': 'James' } } )
-        console.log( age )
-        let kv = await cn.getKVList( "select Firstname, Lastname from contact" )   
-        console.log( JSON.stringify(kv))
-
-        console.log("Single object")
-        let so = await cn.getSingleObject ( { sql: "select * from contact", options: { useSnakeCase: true }  })
-        console.log( JSON.stringify(so))
-
-        console.log("Adding 5000 rows")
-        await cn.beginTrans()
-        contactBO.createValidate = contactBO.defaultCreateValidate
-        for ( let i = 0; i < 5000; i++  ) {
-            await contactBO.create({
-                FIRSTNAME: 'John'+i, 
-                Lastname: 'Doe-'+i, 
-                Birthdate: new Date(2001,5,8, 18,0,0), 
-                Age: 18                   
-            })            
-        }
-        await cn.commitTrans()
-        console.log("Done")
-
-        console.log("Eachrow")
-        cn.forEachRow( "select * from contact", function(row, callback) {
-            console.log(JSON.stringify(row))
-            //callback()
-        })
-        console.log("Done")
-
-    } catch(err) {
-        console.log(err.stack)
-        retErr = err
-    } finally {
-        await cn.close()
-    }
-    if(next) next(retErr)
-}
-
-test1Async = promisify (test1)
-
-
-
-test1();
-
-