doix-db 1.0.37 → 1.0.38

package/index.js

@@ -1,3 +1,5 @@
+const DbQueryBinary = require ('./lib/query/DbQueryBinary.js')
+
 module.exports = {
 
 	DbCallTracker : require ('./lib/DbCallTracker.js'),
@@ -31,7 +33,10 @@ module.exports = {
 	DbQuery:        require ('./lib/query/DbQuery.js'),
 	DbQueryTable:   require ('./lib/query/DbQueryTable.js'),
 	DbQueryColumn:  require ('./lib/query/DbQueryColumn.js'),	
-	DbQueryOr:      require ('./lib/query/DbQueryOr.js'),	
+	DbQueryNot:     require ('./lib/query/DbQueryNot.js'),
+	DbQueryOr:      DbQueryBinary ('OR'),
+	DbQueryAnd:     DbQueryBinary ('AND'),
+
 	DbQueryTableColumnComparison: require ('./lib/query/DbQueryTableColumnComparison.js'),
 
 }

package/lib/query/DbQueryBinary.js

@@ -0,0 +1,35 @@
+module.exports = op => (
+
+	class {
+
+		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 (' ' + op + ' ') + ')'
+		
+		}
+	
+		get params () {
+		
+			let a = []
+			
+			for (const {params} of this.filters) 
+			
+				if (Array.isArray (params))
+				
+					a = a.concat (params)
+		
+			return a
+		
+		}
+	
+	}	
+
+)

package/lib/query/DbQueryNot.js

@@ -0,0 +1,23 @@
+module.exports = 
+
+	class {
+
+		constructor (filter) {
+		
+			this.filter = filter
+		
+		}
+
+		get sql () {
+
+			return `NOT (${this.filter.sql})`
+
+		}
+	
+		get params () {
+		
+			return this.filter.params
+		
+		}
+	
+	}

package/package.json

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

package/lib/query/DbQueryOr.js

@@ -1,33 +0,0 @@
-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