orange-orm 5.0.0-beta.4 → 5.0.0-beta.5

package/README.md

@@ -669,7 +669,7 @@ async function getRows() {
   });
 }
 ```
-You can also use the alternative syntax for the `where` filter. This way, the filter can be constructed independently from the fetching strategy and passed in via the `where` clause.  
+You can also build the `where` filter separately and pass it in via the `where` clause. This keeps the filter independent of the fetching strategy and easier to reuse.  
 ```javascript
 async function getRows() {
   const filter = db.order.lines.any(line => line.product.contains('i'))
@@ -692,7 +692,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const order = await db.order.getOne(undefined /* optional filter */, {
+  const order = await db.order.getOne({
     where: x => x.customer(customer => customer.isActive.eq(true)
                  .and(customer.startsWith('Harr'))),
     customer: true, 
@@ -701,15 +701,16 @@ async function getRows() {
   });
 }
 ```
-You can use also the alternative syntax for the `where-filter`. This way, the filter can be constructed independently from the fetching strategy.    
-It is also possible to combine `where-filter` with the independent filter when using the `getOne` method.  
+You can also build the `where` filter independently and reuse it.    
+With `getOne`, you can combine the positional `where` filter with the `where` option to compose filters.  
 ```javascript
 async function getRows() {
   const filter = db.order.customer(customer => customer.isActive.eq(true)
                  .and(customer.startsWith('Harr')));
-                 //equivalent, but creates slighly different sql:
+                 // equivalent, but creates slightly different SQL:
                  // const filter = db.order.customer.isActive.eq(true).and(db.order.customer.startsWith('Harr'));
-  const order = await db.order.getOne(filter, {
+  const order = await db.order.getOne({
+    where: filter,
     customer: true, 
     deliveryAddress: true, 
     lines: true
@@ -1171,6 +1172,7 @@ express().disable('x-powered-by')
 ```
 
 <sub>📄 browser.ts</sub>
+
 ```ts
 import map from './map';
 
@@ -1179,7 +1181,7 @@ const db = map.http('http://localhost:3000/orange');
 updateRows();
 
 async function updateRows() {
-  const order = await db.order.getOne(undefined, {
+  const order = await db.order.getOne({
     where: x => x.lines.any(line => line.product.startsWith('Magic wand'))
       .and(x.customer.name.startsWith('Harry'),
     lines: true
@@ -1264,7 +1266,7 @@ async function updateRows() {
     }
   );
 
-  const order = await db.order.getOne(undefined, {
+  const order = await db.order.getOne({
     where: x => x.lines.any(line => line.product.startsWith('Magic wand'))
       .and(db.order.customer.name.startsWith('Harry')),
     lines: true

package/dist/index.browser.mjs

@@ -1076,6 +1076,10 @@ function requireUtils () {
 		};
 
 		c.and = function(context, other) {
+			if (other === undefined) {
+				other = context;
+				context = null;
+			}
 			other = negotiateRawSqlFilter(context, other);
 			var nextFilter = negotiateNextAndFilter(filter, other);
 			var next = newBoolean(nextFilter);
@@ -1086,6 +1090,10 @@ function requireUtils () {
 		};
 
 		c.or = function(context, other) {
+			if (other === undefined) {
+				other = context;
+				context = null;
+			}
 			other = negotiateRawSqlFilter(context, other);
 			var nextFilter = negotiateNextOrFilter(filter, other);
 			var next = newBoolean(nextFilter);
@@ -1201,6 +1209,10 @@ function requireEmptyFilter () {
 	emptyFilter.parameters = parameterized.parameters;
 
 	emptyFilter.and = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other);
 		for (var i = 2; i < arguments.length; i++) {
 			other = other.and(context, arguments[i]);
@@ -1209,6 +1221,10 @@ function requireEmptyFilter () {
 	};
 
 	emptyFilter.or = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other);
 		for (var i = 2; i < arguments.length; i++) {
 			other = other.or(context, arguments[i]);
@@ -1217,6 +1233,10 @@ function requireEmptyFilter () {
 	};
 
 	emptyFilter.not = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other).not(context);
 		for (var i = 2; i < arguments.length; i++) {
 			other = other.and(context, arguments[i]);
@@ -4463,7 +4483,7 @@ function requireNewColumn () {
 			alias = extractAlias(alias);
 			from = c.greaterThanOrEqual(context, from, alias);
 			to = c.lessThanOrEqual(context, to, alias);
-			return from.and(to);
+			return from.and(context, to);
 		};
 
 		c.in = function(context, arg, alias) {
@@ -9024,6 +9044,7 @@ function requireGetRelatives$1 () {
 
 	function getRelatives(context, parent, relation) {
 		var queryContext = parent.queryContext;
+		var ctx = context === undefined ? null : context;
 		let strategy = queryContext && queryContext.strategy[relation.leftAlias];
 		var filter = emptyFilter;
 		if (relation.columns.length === 1)
@@ -9044,7 +9065,7 @@ function requireGetRelatives$1 () {
 			}
 
 			if (ids.length > 0)
-				filter = relation.childTable._primaryColumns[0].in(context, ids);
+				filter = relation.childTable._primaryColumns[0].in(ctx, ids);
 		}
 
 		function createCompositeFilter() {
@@ -9052,7 +9073,7 @@ function requireGetRelatives$1 () {
 			for (var i = 0; i < queryContext.rows.length; i++) {
 				keyFilter = rowToPrimaryKeyFilter(context, queryContext.rows[i], relation);
 				if (keyFilter)
-					filter = filter.or(context, keyFilter);
+					filter = filter.or(ctx, keyFilter);
 			}
 		}
 

package/dist/index.mjs

@@ -1077,6 +1077,10 @@ function requireUtils () {
 		};
 
 		c.and = function(context, other) {
+			if (other === undefined) {
+				other = context;
+				context = null;
+			}
 			other = negotiateRawSqlFilter(context, other);
 			var nextFilter = negotiateNextAndFilter(filter, other);
 			var next = newBoolean(nextFilter);
@@ -1087,6 +1091,10 @@ function requireUtils () {
 		};
 
 		c.or = function(context, other) {
+			if (other === undefined) {
+				other = context;
+				context = null;
+			}
 			other = negotiateRawSqlFilter(context, other);
 			var nextFilter = negotiateNextOrFilter(filter, other);
 			var next = newBoolean(nextFilter);
@@ -1202,6 +1210,10 @@ function requireEmptyFilter () {
 	emptyFilter.parameters = parameterized.parameters;
 
 	emptyFilter.and = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other);
 		for (var i = 2; i < arguments.length; i++) {
 			other = other.and(context, arguments[i]);
@@ -1210,6 +1222,10 @@ function requireEmptyFilter () {
 	};
 
 	emptyFilter.or = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other);
 		for (var i = 2; i < arguments.length; i++) {
 			other = other.or(context, arguments[i]);
@@ -1218,6 +1234,10 @@ function requireEmptyFilter () {
 	};
 
 	emptyFilter.not = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other).not(context);
 		for (var i = 2; i < arguments.length; i++) {
 			other = other.and(context, arguments[i]);
@@ -4464,7 +4484,7 @@ function requireNewColumn () {
 			alias = extractAlias(alias);
 			from = c.greaterThanOrEqual(context, from, alias);
 			to = c.lessThanOrEqual(context, to, alias);
-			return from.and(to);
+			return from.and(context, to);
 		};
 
 		c.in = function(context, arg, alias) {
@@ -9025,6 +9045,7 @@ function requireGetRelatives$1 () {
 
 	function getRelatives(context, parent, relation) {
 		var queryContext = parent.queryContext;
+		var ctx = context === undefined ? null : context;
 		let strategy = queryContext && queryContext.strategy[relation.leftAlias];
 		var filter = emptyFilter;
 		if (relation.columns.length === 1)
@@ -9045,7 +9066,7 @@ function requireGetRelatives$1 () {
 			}
 
 			if (ids.length > 0)
-				filter = relation.childTable._primaryColumns[0].in(context, ids);
+				filter = relation.childTable._primaryColumns[0].in(ctx, ids);
 		}
 
 		function createCompositeFilter() {
@@ -9053,7 +9074,7 @@ function requireGetRelatives$1 () {
 			for (var i = 0; i < queryContext.rows.length; i++) {
 				keyFilter = rowToPrimaryKeyFilter(context, queryContext.rows[i], relation);
 				if (keyFilter)
-					filter = filter.or(context, keyFilter);
+					filter = filter.or(ctx, keyFilter);
 			}
 		}
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "orange-orm",
-    "version": "5.0.0-beta.4",
+    "version": "5.0.0-beta.5",
     "publishConfig": {
         "access": "public"
     },

package/src/emptyFilter.js

@@ -8,6 +8,10 @@ emptyFilter.sql = parameterized.sql.bind(parameterized);
 emptyFilter.parameters = parameterized.parameters;
 
 emptyFilter.and = function(context, other) {
+	if (other === undefined) {
+		other = context;
+		context = null;
+	}
 	other = negotiateRawSqlFilter(context, other);
 	for (var i = 2; i < arguments.length; i++) {
 		other = other.and(context, arguments[i]);
@@ -16,6 +20,10 @@ emptyFilter.and = function(context, other) {
 };
 
 emptyFilter.or = function(context, other) {
+	if (other === undefined) {
+		other = context;
+		context = null;
+	}
 	other = negotiateRawSqlFilter(context, other);
 	for (var i = 2; i < arguments.length; i++) {
 		other = other.or(context, arguments[i]);
@@ -24,6 +32,10 @@ emptyFilter.or = function(context, other) {
 };
 
 emptyFilter.not = function(context, other) {
+	if (other === undefined) {
+		other = context;
+		context = null;
+	}
 	other = negotiateRawSqlFilter(context, other).not(context);
 	for (var i = 2; i < arguments.length; i++) {
 		other = other.and(context, arguments[i]);

package/src/table/column/newColumn.js

@@ -55,7 +55,7 @@ module.exports = function(table, name) {
 		alias = extractAlias(alias);
 		from = c.greaterThanOrEqual(context, from, alias);
 		to = c.lessThanOrEqual(context, to, alias);
-		return from.and(to);
+		return from.and(context, to);
 	};
 
 	c.in = function(context, arg, alias) {
@@ -102,4 +102,4 @@ module.exports = function(table, name) {
 	}
 
 	return c;
-};
+};

package/src/table/column/utils.js

@@ -18,6 +18,10 @@ function newBoolean(filter) {
 	};
 
 	c.and = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other);
 		var nextFilter = negotiateNextAndFilter(filter, other);
 		var next = newBoolean(nextFilter);
@@ -28,6 +32,10 @@ function newBoolean(filter) {
 	};
 
 	c.or = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other);
 		var nextFilter = negotiateNextOrFilter(filter, other);
 		var next = newBoolean(nextFilter);

package/src/table/joinRelation/getRelatives.js

@@ -4,6 +4,7 @@ var negotiateExpandInverse = require('../negotiateExpandInverse');
 
 function getRelatives(context, parent, relation) {
 	var queryContext = parent.queryContext;
+	var ctx = context === undefined ? null : context;
 	let strategy = queryContext && queryContext.strategy[relation.leftAlias];
 	var filter = emptyFilter;
 	if (relation.columns.length === 1)
@@ -24,7 +25,7 @@ function getRelatives(context, parent, relation) {
 		}
 
 		if (ids.length > 0)
-			filter = relation.childTable._primaryColumns[0].in(context, ids);
+			filter = relation.childTable._primaryColumns[0].in(ctx, ids);
 	}
 
 	function createCompositeFilter() {
@@ -32,7 +33,7 @@ function getRelatives(context, parent, relation) {
 		for (var i = 0; i < queryContext.rows.length; i++) {
 			keyFilter = rowToPrimaryKeyFilter(context, queryContext.rows[i], relation);
 			if (keyFilter)
-				filter = filter.or(context, keyFilter);
+				filter = filter.or(ctx, keyFilter);
 		}
 	}
 
@@ -61,4 +62,4 @@ function isNullOrUndefined(item) {
 	return item === null || item === undefined;
 }
 
-module.exports = getRelatives;
+module.exports = getRelatives;