doix-db 0.0.19 → 0.0.21

package/index.js

@@ -13,5 +13,6 @@ module.exports = {
 	DbModel:        require ('./lib/model/DbModel.js'),
 	DbQuery:        require ('./lib/query/DbQuery.js'),
 	DbQueryTable:   require ('./lib/query/DbQueryTable.js'),
-	DbQueryColumn:  require ('./lib/query/DbQueryColumn.js'),
+	DbQueryColumn:  require ('./lib/query/DbQueryColumn.js'),	
+	DbQueryOr:      require ('./lib/query/DbQueryOr.js'),
 }

package/lib/DbLang.js

@@ -75,11 +75,11 @@ class DbLang {
 		switch (filter.op) {
 
 			case 'ILIKE':
-				filter.expr = 'UPPER(' + filter.expr + ') LIKE UPPER(?)'
+				filter.sql = 'UPPER(' + filter.sql + ') LIKE UPPER(?)'
 				return null
 
 			case 'NOT ILIKE':			
-				filter.expr = 'UPPER(' + filter.expr + ') NOT LIKE UPPER(?)'
+				filter.sql = 'UPPER(' + filter.sql + ') NOT LIKE UPPER(?)'
 				return null
 
 			case '=':
@@ -110,11 +110,11 @@ class DbLang {
 	
 		const params = []
 
-		let select = ''; for (const {expr, qName} of query.columns.values ()) {
+		let select = ''; for (const {sql, qName} of query.columns.values ()) {
 
 			if (select.length !== 0) select += ','
 
-			select += expr + ' AS ' + qName
+			select += sql + ' AS ' + qName
 
 		}
 		
@@ -122,7 +122,7 @@ class DbLang {
 		
 			if (!t.isFirst) from += ' ' + t.join + ' JOIN '
 		
-			from += t.expr + ' AS ' + t.qName
+			from += t.sql + ' AS ' + t.qName
 
 			if (!t.isFirst) {
 			
@@ -140,11 +140,11 @@ class DbLang {
 
 		}
 		
-		let order = ''; for (const {expr, desc} of query.order) {
+		let order = ''; for (const {sql, desc} of query.order) {
 
 			if (order.length !== 0) order += ','
 
-			order += expr; if (desc) order += ' DESC'
+			order += sql; if (desc) order += ' DESC'
 
 		}
 		
@@ -176,7 +176,7 @@ class DbLang {
 	
 		for (const p of filter.params) params.push (p)
 		
-		return sql + filter.expr
+		return sql + filter.sql
 	
 	}
 	

package/lib/model/DbModel.js

@@ -122,9 +122,9 @@ class DbModel extends EventEmitter {
 
 	}
 	
-	createQuery (from) {
+	createQuery (from, options) {
 	
-		return new DbQuery (this, from)
+		return new DbQuery (this, from, options)
 	
 	}
 

package/lib/query/DbQuery.js

@@ -3,7 +3,7 @@ const DbQueryColumn = require ('./DbQueryColumn.js')
 
 class DbQuery {
 
-	constructor (model, from = []) {
+	constructor (model, from = [], options = {}) {
 		
 		this.model = model
 
@@ -15,13 +15,30 @@ class DbQuery {
 
 		this.order = []
 		
-		for (const [expr, o] of from) this.addTable (expr, o)
+		this.options = options
+		
+		for (const [sql, o] of from) this.addTable (sql, o)
+		
+		if ('order' in options) for (const o of options.order) {
+		
+			if (Array.isArray (o)) {
+				
+				this.orderBy (o [0], o [1])
+
+			}
+			else {
+
+				this.orderBy (o)
+
+			}
+		
+		}
 
 	}
 	
-	addTable (expr, o = {}) {
+	addTable (sql, o = {}) {
 	
-		return new DbQueryTable (this, expr, o)
+		return new DbQueryTable (this, sql, o)
 		
 	}
 	
@@ -61,7 +78,7 @@ class DbQuery {
 
 			}
 
-			const t = q.addTable (table.relation ? table.relation.name : table.expr, o)
+			const t = q.addTable (table.relation ? table.relation.name : table.sql, o)
 			
 			for (const f of table.filters) f.clone (t)
 

package/lib/query/DbQueryColumn.js

@@ -1,10 +1,10 @@
 class DbQueryColumn {
 
-	constructor (query, expr, alias) {
+	constructor (query, sql, alias) {
 	
 		this.query = query
 
-		this.expr = expr
+		this.sql = sql
 
 		this.alias = alias
 

package/lib/query/DbQueryOr.js

@@ -0,0 +1,33 @@
+class DbQueryOr {
+
+	constructor (filters = []) {
+	
+		this.filters = filters
+	
+	}
+	
+	get sql () {
+	
+		const {filters} = this; if (filters.length === 0) throw Error ('No one term in this search condition')
+
+		return filters.map (i => i.sql).join (' OR ')
+	
+	}
+
+	get params () {
+	
+		let a = []
+		
+		for (const {params} of this.filters) 
+		
+			if (Array.isArray (params))
+			
+				a = a.concat (params)
+	
+		return a
+	
+	}
+
+}
+
+module.exports = DbQueryOr

package/lib/query/DbQueryTable.js

@@ -6,7 +6,7 @@ const JOIN_TYPES_ALOWED = ['LEFT', 'INNER', 'CROSS']
 
 class DbQueryTable {
 
-	constructor (query, expr, o = {}) {
+	constructor (query, sql, o = {}) {
 
 		const {model, lang} = query, {map} = model
 		
@@ -16,13 +16,13 @@ class DbQueryTable {
 		
 		this.lang = lang
 		
-		if (map.has (expr)) {
+		if (map.has (sql)) {
 
-			this.relation = map.get (expr)
+			this.relation = map.get (sql)
 			
-			this.expr = this.relation.qName
+			this.sql = this.relation.qName
 
-			this.alias = o.as || expr
+			this.alias = o.as || sql
 
 			const {columns} = this.relation
 			
@@ -35,7 +35,7 @@ class DbQueryTable {
 
 			this.alias = o.as
 
-			this.expr = expr
+			this.sql = sql
 
 		}
 

package/lib/query/DbQueryTableColumnComparison.js

@@ -8,7 +8,7 @@ class DbQueryTableColumnComparison {
 				
 		this.op = op.toUpperCase ()
 				
-		this.expr = table.qName + '.' + this.column.qName
+		this.sql = table.qName + '.' + this.column.qName
 		
 		this.setParams (value)
 
@@ -20,7 +20,7 @@ class DbQueryTableColumnComparison {
 	
 		const result = new DbQueryTableColumnComparison (table, this.column.name, this.op, this.params)
 		
-		result.expr   = this.expr
+		result.sql   = this.sql
 
 		result.params = this.params
 		
@@ -36,7 +36,7 @@ class DbQueryTableColumnComparison {
 		
 			this.params = []
 			
-			this.expr += ' ' + op
+			this.sql += ' ' + op
 			
 			return
 			
@@ -46,7 +46,7 @@ class DbQueryTableColumnComparison {
 
 			this.params = lang.toParamsSql (query)
 
-			this.expr += ' (' + params.pop () + ')'
+			this.sql += ' (' + params.pop () + ')'
 			
 			return
 
@@ -58,7 +58,7 @@ class DbQueryTableColumnComparison {
 			
 			const right = lang.genComparisonRightPart (this)
 			
-			if (right !== null) this.expr += ' ' + op + ' ' + right
+			if (right !== null) this.sql += ' ' + op + ' ' + right
 
 			return
 
@@ -70,15 +70,15 @@ class DbQueryTableColumnComparison {
 
 			this.params = []
 
-			this.expr = this.op === 'IN' ? '0=1' : '0=0'
+			this.sql = this.op === 'IN' ? '0=1' : '0=0'
 
 		}
 		else {
 		
 			this.params = value
 
-			this.expr += ' ' + op + ' '
-			this.expr += lang.genComparisonRightPart (this)
+			this.sql += ' ' + op + ' '
+			this.sql += lang.genComparisonRightPart (this)
 
 		}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doix-db",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "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": "^0.0.36"
+    "doix": "^0.0.37"
   },
   "devDependencies": {
     "jest": "^29.3.1"