doix-db 0.0.18 → 0.0.19

package/lib/DbLang.js

@@ -74,6 +74,14 @@ class DbLang {
 		
 		switch (filter.op) {
 
+			case 'ILIKE':
+				filter.expr = 'UPPER(' + filter.expr + ') LIKE UPPER(?)'
+				return null
+
+			case 'NOT ILIKE':			
+				filter.expr = 'UPPER(' + filter.expr + ') NOT LIKE UPPER(?)'
+				return null
+
 			case '=':
 			case '<':
 			case '>':
@@ -124,7 +132,7 @@ class DbLang {
 				
 					from += ' AND '
 
-					from = filter.appendTo (from, params)
+					from = this.appendFilter (from, params, filter)
 
 				}
 
@@ -148,7 +156,7 @@ class DbLang {
 			
 				if (where.length !== 0) where += ' AND '
 			
-				where = filter.appendTo (where, params)
+				where = this.appendFilter (where, params, filter)
 				
 			}
 			
@@ -164,6 +172,14 @@ class DbLang {
 
 	}
 	
+	appendFilter (sql, params, filter) {
+	
+		for (const p of filter.params) params.push (p)
+		
+		return sql + filter.expr
+	
+	}
+	
 	genCreateMockView ({qName, columns}) {
 
 		return 'CREATE VIEW ' + qName + ' AS SELECT ' + Object.values (columns)

package/lib/query/DbQuery.js

@@ -61,7 +61,9 @@ class DbQuery {
 
 			}
 
-			q.addTable (table.relation ? table.relation.name : table.expr, o)
+			const t = q.addTable (table.relation ? table.relation.name : table.expr, o)
+			
+			for (const f of table.filters) f.clone (t)
 
 		}
 

package/lib/query/DbQueryTableColumnComparison.js

@@ -8,7 +8,7 @@ class DbQueryTableColumnComparison {
 				
 		this.op = op.toUpperCase ()
 				
-		this.expr = table.qName + '.' + this.column.qName + ' ' + op
+		this.expr = table.qName + '.' + this.column.qName
 		
 		this.setParams (value)
 
@@ -16,6 +16,18 @@ class DbQueryTableColumnComparison {
 
 	}
 	
+	clone (table) {
+	
+		const result = new DbQueryTableColumnComparison (table, this.column.name, this.op, this.params)
+		
+		result.expr   = this.expr
+
+		result.params = this.params
+		
+		return result
+	
+	}
+	
 	setParams (value) {
 
 		const {op, table} = this, {lang} = table
@@ -24,6 +36,8 @@ class DbQueryTableColumnComparison {
 		
 			this.params = []
 			
+			this.expr += ' ' + op
+			
 			return
 			
 		}
@@ -41,9 +55,10 @@ class DbQueryTableColumnComparison {
 		if (this.op !== 'IN' && this.op !== 'NOT IN') {
 
 			this.params = Array.isArray (value) ? value : [value]
-
-			this.expr += ' '
-			this.expr += lang.genComparisonRightPart (this)
+			
+			const right = lang.genComparisonRightPart (this)
+			
+			if (right !== null) this.expr += ' ' + op + ' ' + right
 
 			return
 
@@ -62,20 +77,12 @@ class DbQueryTableColumnComparison {
 		
 			this.params = value
 
-			this.expr += ' '
+			this.expr += ' ' + op + ' '
 			this.expr += lang.genComparisonRightPart (this)
 
 		}
 
 	}
-	
-	appendTo (sql, params) {
-	
-		for (const p of this.params) params.push (p)
-		
-		return sql + this.expr
-	
-	}
 
 }
 

package/package.json

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