doix-db 1.0.29 → 1.0.31

package/lib/DbClient.js

@@ -1,6 +1,6 @@
 const EventEmitter    = require ('events')
 const {randomUUID}    = require ('crypto')
-const {Readable}      = require ('stream')
+const {Readable, Writable}      = require ('stream')
 
 const DbCsvPrinter    = require ('./DbCsvPrinter.js')
 const DbCall          = require ('./DbCall.js')
@@ -130,7 +130,49 @@ class DbClient extends EventEmitter {
 		
 	}
 
-	async do (sql, params = [], options = {}) {
+	async do (q, params = [], options = {}) {
+
+		let sql
+
+		if (typeof q === 'string') {
+
+			sql = q
+
+		}
+		else if (Array.isArray (q)) {
+
+			const {length} = q; if (length === 0 || length > 2) throw Error ('Invalid `do` array parameter length: ' + length)
+
+			sql = q [0]
+
+			if (length === 2) params = q [1]
+
+		}
+		else if (typeof q === 'object') {
+
+			if ('sql' in q) {
+
+				sql = q.sql 
+
+			} 
+			else {
+
+				throw Error ('Invalid `do` object parameter')
+
+			}
+
+			if ('params' in q) {
+
+				params = q.params
+
+			} 
+
+		}
+		else {
+
+			throw Error ('Invalid `do` parameter: ' + q)
+
+		}
 
 		const call = this.call (sql, params, {
 			...options,
@@ -145,6 +187,50 @@ class DbClient extends EventEmitter {
 
 	}
 
+	batch (options = {}) {
+
+		const db = this
+
+		return new Writable ({...options, objectMode: true,
+
+			write (qp, _, callback) {
+
+				db.do (qp).then (_ => callback (), callback)
+
+			}
+
+		})
+
+	}
+
+	async doAll (statements, options = {}) {
+
+		if (typeof statements !== 'object') throw Error ('Expected iterable or readable, got ' + statements)
+
+		if (statements === null) throw Error ('Expected iterable or readable, got null')
+
+		if (!(statements instanceof Readable)) {
+
+			if (typeof statements [Symbol.iterator] !== 'function') throw Error ('Expected iterable or readable, got ' + statements)
+
+			statements = Readable.from (statements)
+
+		}
+
+		const executor = this.batch (options)
+
+		return new Promise ((ok, fail) => {
+
+			statements.on ('error', fail)
+			executor.on ('error', fail)
+			executor.on ('close', ok)
+
+			statements.pipe (executor)
+
+		})
+
+	}
+
 	async insert (name, data, options = {}) {
 			
 		if (data instanceof Readable) {			

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doix-db",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "description": "Shared database related code for doix",
   "main": "index.js",
   "files": [