doix-db 1.0.39 → 1.0.40

package/lib/query/DbQuery.js

@@ -35,6 +35,12 @@ class DbQuery {
 		}
 
 	}
+
+	get root () {
+
+		return this.tables [0]
+
+	}
 	
 	addTable (sql, o = {}) {
 	

package/lib/query/DbQueryBinary.js

@@ -1,18 +1,32 @@
-module.exports = op => (
+module.exports = op => {
 
-	class {
+	const clazz = class {
 
-		constructor (filters = []) {
+		constructor (filters) {
 		
 			this.filters = filters
 		
 		}
+
+		static from (filters) {
+
+			filters = filters.filter (i => i != null)
+
+			switch (filters.length) {
+
+				case 0:  return null
+
+				case 1:  return filters [0]
+
+				default: return new clazz (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 + ' ') + ')'
+			
+			return '(' + this.filters.map (i => '(' + i.sql + ')').join (' ' + op + ' ') + ')'
 		
 		}
 	
@@ -30,6 +44,8 @@ module.exports = op => (
 		
 		}
 	
-	}	
+	}
+
+	return clazz
 
-)
+}

package/lib/query/DbQueryNot.js

@@ -1,6 +1,4 @@
-module.exports = 
-
-	class {
+	class DbQueryNot {
 
 		constructor (filter) {
 		
@@ -8,6 +6,14 @@ module.exports =
 		
 		}
 
+		static from (filter) {
+
+			if (filter === null) return null
+
+			return new DbQueryNot (filter)
+
+		}
+
 		get sql () {
 
 			return `NOT (${this.filter.sql})`
@@ -20,4 +26,6 @@ module.exports =
 		
 		}
 	
-	}
+	}
+
+	module.exports = DbQueryNot

package/lib/query/DbQueryTable.js

@@ -82,13 +82,17 @@ class DbQueryTable {
 
 	}
 
-	addColumnComparison (name, op, value) {
+	addFilter (filter) {
+
+		if (filter == null) return
 
-		const result = this.createColumnComparison (name, op, value)
+		this.filters.push (filter)
 
-		if (result !== null) this.filters.push (result)
+	}
+
+	addColumnComparison (name, op, value) {
 
-		return result
+		this.addFilter (this.createColumnComparison (name, op, value))
 
 	}
 	

package/package.json

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