doix-db 0.0.22 → 0.0.24

package/lib/DbLang.js

@@ -7,6 +7,8 @@ const QQ_ESC = new stringEscape ([
   [ '"', '""'],
 ])
 
+const DELIM_UPDATE = [',', ' AND ']
+
 class DbLang {
 
 	getDbObjectClass (o) {
@@ -105,6 +107,61 @@ class DbLang {
 		}
 	
 	}
+	
+	genUpdateParamsSql (name, data) {
+
+		const {model} = this; if (!model) throw Error ('Model not set')
+
+		const {map} = model; if (!map.has (name)) throw Error ('Entity not defined: ' + name)
+		
+		const {pk, columns, qName} = map.get (name)
+
+		const sql = ['', ''], params = []
+		
+		for (const [k, v] of Object.entries (data)) {
+
+			if (v === undefined) continue
+
+			if (!(k in columns)) continue
+
+			const {qName, nullable} = columns [k]
+			
+			const i = pk.includes (k) ? 1 : 0
+
+			if (sql [i].length !== 0) sql [i] += DELIM_UPDATE [i]
+
+			sql [i] += qName + '='
+
+			if (v === null && !nullable) {
+			
+				sql [i] += 'DEFAULT'
+			
+			}
+			else {
+			
+				sql [i] += '?'
+
+				if (i === 0) params.push (v)
+			
+			}
+
+		}
+
+		for (const k of pk) {
+
+			const v = data [k]; if (v == null) throw Error (`The value of ${k} must be defined and not null`)
+			
+			params.push (v)
+
+		}
+
+		if (sql [0].length === 0) return null
+				
+		params.push (`UPDATE ${qName} SET ${sql [0]} WHERE ${sql [1]}`)
+		
+		return params
+
+	} 
 
 	toParamsSql (query) {
 	

package/lib/model/DbModel.js

@@ -38,6 +38,8 @@ class DbModel extends EventEmitter {
 		}
 
 		this.lang = 'db' in this ? this.db.lang : new DbLang ()
+		
+		this.lang.model = this
 
 		this.map = new DbObjectMap (mapOptions)
 

package/lib/query/DbQuery.js

@@ -80,7 +80,7 @@ class DbQuery {
 
 			const t = q.addTable (table.relation ? table.relation.name : table.sql, o)
 			
-			for (const f of table.filters) f.clone (t)
+			for (const {sql, params} of table.filters) t.filters.push ({sql, params: [...params]})
 
 		}
 

package/lib/query/DbQueryTableColumnComparison.js

@@ -16,18 +16,6 @@ class DbQueryTableColumnComparison {
 
 	}
 	
-	clone (table) {
-	
-		const result = new DbQueryTableColumnComparison (table, this.column.name, this.op, this.params)
-		
-		result.sql   = this.sql
-
-		result.params = this.params
-		
-		return result
-	
-	}
-	
 	setParams (value) {
 
 		const {op, table} = this, {lang} = table

package/package.json

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