doix-db 1.0.77 → 1.0.79

package/lib/DbCsvPrinter.js

@@ -2,6 +2,7 @@ const DbColumn = require ('./model/DbColumn.js')
 const DbTypeArithmetic =      require ('./model/types/DbTypeArithmetic.js')
 const DbTypeArithmeticInt =   require ('./model/types/DbTypeArithmeticInt.js')
 const DbTypeArithmeticFixed = require ('./model/types/DbTypeArithmeticFixed.js')
+const DbTypeArithmeticFloat = require ('./model/types/DbTypeArithmeticFloat.js')
 const DbTypeCharacter =       require ('./model/types/DbTypeCharacter.js')
 const DbTypeTemporal =        require ('./model/types/DbTypeTemporal.js')
 const DbTypeDate =            require ('./model/types/DbTypeDate.js')
@@ -26,15 +27,24 @@ const FMT_ISO_TIMESTAMP = new Intl.DateTimeFormat ('sv', {
 	fractionalSecondDigits: 3
 })
 
+const DEFAULT = {
+	NULL              :     '',
+	NaN               :  'NaN',
+	TRUE              :    '1',
+	FALSE             :    '0',
+	POSITIVE_INFINITY :  'inf',
+	NEGATIVE_INFINITY : '-inf',
+}
+
 class DbCsvPrinter extends Transform {
 
 	constructor (options = {}) {
 
-		let {table, columns, lang, NULL} = options
+		let {table, columns, lang} = options
 
 		super ({writableObjectMode: true})
 
-		this.NULL = typeof NULL === 'string' ? NULL : ''
+		for (const k in DEFAULT) this [k] = options [k] ?? DEFAULT [k]
 
 		if (!columns) {
 			if (!table) throw Error (`Either table or columns must be defined`)
@@ -105,56 +115,62 @@ class DbCsvPrinter extends Transform {
 
 				const value = r [name], v = value == null ? column.default : value
 
-				switch (v) {
-					case Number.POSITIVE_INFINITY:
-					case Number.NEGATIVE_INFINITY:
-						throw Error (`${column.name}: infinite values not supported`)
+				if (Number.isNaN (v)) { // `Number.NaN` doesn't work as a `switch` `case`
+
+					if (!(typeDef instanceof DbTypeArithmeticFloat)) throw Error (`NaN values are only supported for floating point numeric types, but ${column.name} is defined as ${column.type}`)
+
+					s += this.NaN
+
+					continue
+
 				}
 
-				if (v == null) {
+				if (v == null) { // here, `undefined` fits too
 
 					if (!column.nullable) throw Error (`${name} doesn't allow null values`)
 
 					s += this.NULL
 
-				}
-				else if (typeof v === 'boolean') {
-
-					s += v ? '1' : '0'
+					continue
 
 				}
-				else if (typeDef instanceof DbTypeCharacter) {
 
-					s += CH_QQ
-					s += QQ_ESC.escape (String (v))
-					s += CH_QQ
+				switch (v) {
 
-				}
-				else if (typeDef instanceof DbTypeArithmetic) {
+					case true:
+						s += this.TRUE
+						continue
 
-					const n = Number (v)
+					case false:
+						s += this.FALSE
+						continue
 
-					if (typeDef instanceof DbTypeArithmeticInt) {
+					case Number.POSITIVE_INFINITY:
+						if (!(typeDef instanceof DbTypeArithmeticFloat)) throw Error (`Infinity values are only supported for floating point numeric types, but ${column.name} is defined as ${column.type}`)
+						s += this.POSITIVE_INFINITY
+						continue
 
-						if (!Number.isInteger (Number (v))) throw Error (`${column.name} must be integer, found ${value}`)
+					case Number.NEGATIVE_INFINITY:
+						if (!(typeDef instanceof DbTypeArithmeticFloat)) throw Error (`-Infinity values are only supported for floating point numeric types, but ${column.name} is defined as ${column.type}`)
+						s += this.NEGATIVE_INFINITY
+						continue
 
-						s += v
+				}
 
-					}
-					else if (typeDef instanceof DbTypeArithmeticFixed) {
+				if (typeDef instanceof DbTypeCharacter) {
 
-						if (!Number.isFinite (n)) throw Error (`${column.name} must be a finite number, found ${value}`)
+					s += CH_QQ
+					s += QQ_ESC.escape (String (v))
+					s += CH_QQ
 
-						s += n.toFixed (column.scale)
+				}
+				else if (typeDef instanceof DbTypeArithmetic) {
 
-					}
-					else {
+					const n = Number (v); if (Number.isNaN (n)) throw Error (`${column.name} must be a number, found a ${typeof value} '${value}'`)
 
-						if (Number.isNaN (n)) throw Error (`${column.name} must be a number, found ${value}`)
+					if (typeDef instanceof DbTypeArithmeticInt && !Number.isInteger (Number (v))) throw Error (`${column.name} must be integer, found ${value}`)
 
-						s += v
-							
-					}
+					s += typeDef instanceof DbTypeArithmeticFixed ? n.toFixed (column.scale) : n
 
 				}
 				else if (typeDef instanceof DbTypeTemporal) {

package/lib/DbPool.js

@@ -4,12 +4,10 @@ class DbPool extends ResourcePool {
 
 	constructor (o) {
 
-		super ()
+		super (o)
 
 		this.shared.add ('model')
 		this.shared.add ('lang')
-		
-		this.logger = o.logger
 
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doix-db",
-  "version": "1.0.77",
+  "version": "1.0.79",
   "description": "Shared database related code for doix",
   "main": "index.js",
   "files": [
@@ -40,7 +40,7 @@
   },
   "homepage": "https://github.com/do-/node-doix-db#readme",
   "peerDependencies": {
-    "doix": "^1.0.57"
+    "doix": "^1.0.61"
   },
   "devDependencies": {
     "jest": "^29.6.1"