doix-db 0.0.17 → 0.0.18

package/lib/DbLang.js

@@ -54,8 +54,53 @@ class DbLang {
 		return s + ')'
 
 	}
+	
+	isUnaryOperator (op) {
+
+		switch (op) {
+
+			case 'IS NULL':
+			case 'IS NOT NULL':
+				return true
+
+			default:
+				return false
+
+		}
+
+	}
+
+	genComparisonRightPart (filter) {
+		
+		switch (filter.op) {
+
+			case '=':
+			case '<':
+			case '>':
+			case '<=':
+			case '>=':
+			case '<>':
+			case 'LIKE':
+			case 'NOT LIKE':
+				return '?'
+
+			case 'BETWEEN':
+				return '? AND ?'
+
+			case 'IN':
+			case 'NOT IN':
+				return '(?' + ',?'.repeat (filter.params.length - 1) + ')'
+
+			default:
+				throw Error ('Unknown comparison operator: ' + op)
+
+		}
+	
+	}
 
 	toParamsSql (query) {
+	
+		const params = []
 
 		let select = ''; for (const {expr, qName} of query.columns.values ()) {
 
@@ -65,17 +110,25 @@ class DbLang {
 
 		}
 		
-//		const [t] = query.tables
-
-//		const from = t.expr + ' AS ' + t.qName
-
 		let from = ''; for (const t of query.tables) {
 		
 			if (!t.isFirst) from += ' ' + t.join + ' JOIN '
 		
 			from += t.expr + ' AS ' + t.qName
 
-			if (!t.isFirst) from += ' ON ' + t.on
+			if (!t.isFirst) {
+			
+				from += ' ON ' + t.on
+				
+				for (const filter of t.filters) {
+				
+					from += ' AND '
+
+					from = filter.appendTo (from, params)
+
+				}
+
+			}
 
 		}
 		
@@ -89,9 +142,25 @@ class DbLang {
 		
 		let sql = 'SELECT ' + select + ' FROM ' + from
 		
+		const {filters} = query.tables [0]; if (filters.length !== 0) {
+		
+			let where = ''; for (const filter of filters) {
+			
+				if (where.length !== 0) where += ' AND '
+			
+				where = filter.appendTo (where, params)
+				
+			}
+			
+			sql += ' WHERE ' + where
+		
+		}
+
 		if (order.length !== 0) sql += ' ORDER BY ' + order
 		
-		return [sql]
+		params.push (sql)
+		
+		return params
 
 	}
 	

package/lib/query/DbQueryTable.js

@@ -1,5 +1,6 @@
 const DbRelation = require ('../model/DbRelation.js')
 const DbQueryColumn = require ('./DbQueryColumn.js')
+const DbQueryTableColumnComparison = require ('./DbQueryTableColumnComparison.js')
 
 const JOIN_TYPES_ALOWED = ['LEFT', 'INNER', 'CROSS']
 
@@ -63,6 +64,12 @@ class DbQueryTable {
 				if ('on' in o) throw Error ('Only LEFT and INNER JOIN can have the ON clause')
 		
 		}
+		
+		this.filters = []
+		
+		if (o.filters) for (const [name, op, value] of o.filters)
+
+			this.addColumnComparison (name, op, value)
 
 		query.tables.push (this)
 
@@ -73,6 +80,14 @@ class DbQueryTable {
 		return this.lang.quoteName (this.alias)
 	
 	}
+
+	addColumnComparison (name, op, value) {
+		
+		if (value == null && !this.lang.isUnaryOperator (op)) return
+
+		new DbQueryTableColumnComparison (this, name, op, value)
+
+	}
 	
 	adjustJoinCondition () {
 

package/lib/query/DbQueryTableColumnComparison.js

@@ -0,0 +1,82 @@
+class DbQueryTableColumnComparison {
+
+	constructor (table, name, op, value) {
+
+		this.table = table
+		
+		this.column = table.relation.columns [name]
+				
+		this.op = op.toUpperCase ()
+				
+		this.expr = table.qName + '.' + this.column.qName + ' ' + op
+		
+		this.setParams (value)
+
+		table.filters.push (this)
+
+	}
+	
+	setParams (value) {
+
+		const {op, table} = this, {lang} = table
+
+		if (lang.isUnaryOperator (op)) {
+		
+			this.params = []
+			
+			return
+			
+		}
+/*
+		if (value instanceof DbQuery) {
+
+			this.params = lang.toParamsSql (query)
+
+			this.expr += ' (' + params.pop () + ')'
+			
+			return
+
+		}
+*/
+		if (this.op !== 'IN' && this.op !== 'NOT IN') {
+
+			this.params = Array.isArray (value) ? value : [value]
+
+			this.expr += ' '
+			this.expr += lang.genComparisonRightPart (this)
+
+			return
+
+		}
+
+		if (!Array.isArray (value)) throw Error (`An Array value is required for ${op}`)
+
+		if (value.length === 0) {
+
+			this.params = []
+
+			this.expr = this.op === 'IN' ? '0=1' : '0=0'
+
+		}
+		else {
+		
+			this.params = value
+
+			this.expr += ' '
+			this.expr += lang.genComparisonRightPart (this)
+
+		}
+
+	}
+	
+	appendTo (sql, params) {
+	
+		for (const p of this.params) params.push (p)
+		
+		return sql + this.expr
+	
+	}
+
+}
+
+module.exports = DbQueryTableColumnComparison

package/package.json

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