doix-db 1.0.71 → 1.0.73

package/lib/DbClient.js

@@ -250,15 +250,25 @@ class DbClient extends EventEmitter {
 
 		const executor = this.batch (options)
 
-		return new Promise ((ok, fail) => {
+		try {
 
-			statements.on ('error', fail)
-			executor.on ('error', fail)
-			executor.on ('close', ok)
+			await new Promise ((ok, fail) => {
 
-			statements.pipe (executor)
+				statements.on ('error', fail)
+				executor.on ('error', fail)
+				executor.on ('close', ok)
+	
+				statements.pipe (executor)
+	
+			})
+	
 
-		})
+		}
+		catch (cause) {
+
+			throw Error (cause.message, {cause})
+
+		}
 
 	}
 

package/lib/DbLang.js

@@ -454,27 +454,39 @@ class DbLang {
 	
 	}
 
-	genColumnDefault (column) {
-	
-		const def = column.default; 
-		
-		if (def === 'NULL' || def.indexOf ('(') !== -1) return def
+	* genColumnConstraints (column) {
 
-		return this.quoteLiteral (def)
+		if (column.nullable === false) yield 'NOT NULL'
 
 	}
 
-	genColumnDefinition (column) {
+	genColumnDataType (column) {
 
-		const {qName, typeDim, nullable} = column
+		return column.typeDim
 
-		let s = qName + ' ' + typeDim
-		
-		if (column.default != null) s += ' DEFAULT ' + this.genColumnDefault (column)
+	}
 
-		if (nullable === false) s += ' NOT NULL'
-		
-		return s
+	* genColumnDefinitionParts (column) {
+
+		yield column.qName
+
+		yield this.genColumnDataType (column)
+
+		{
+
+			const def = column.default
+
+			if (def) yield 'DEFAULT ' + def
+
+		}
+
+		for (const c of this.genColumnConstraints (column)) yield c
+
+	}
+
+	genColumnDefinition (column) {
+
+		return [...this.genColumnDefinitionParts (column)].join (' ')
 
 	}
 	

package/package.json

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