orange-orm 4.7.3-beta.0 → 4.7.3

package/dist/index.browser.mjs

@@ -3853,10 +3853,9 @@ function requireLessThanOrEqual () {
 	hasRequiredLessThanOrEqual = 1;
 	var newBoolean = requireNewBoolean();
 	var encodeFilterArg = requireEncodeFilterArg();
-	const getSessionSingleton = requireGetSessionSingleton();
+	var quote = requireQuote$2();
 
 	function lessThanOrEqual(context, column,arg,alias) {
-		const quote = getSessionSingleton(context, 'quote');
 		var operator = '<=';
 		var encoded = encodeFilterArg(context, column, arg);
 		var firstPart = quote(context, alias) + '.' + quote(context, column._dbName) + operator;
@@ -10819,63 +10818,6 @@ function requireGetManyDto$1 () {
 		return obj;
 	}
 
-
-	// function newCreateRow(span) {
-	// 	const columnsMap = span.columns;
-	// 	const columns = span.table._columns.filter(column => !columnsMap || columnsMap.get(column));
-	// 	const ProtoRow = createProto(columns, span);
-	// 	const manyNames = [];
-
-	// 	const c = {
-	// 		visitJoin: () => { },
-	// 		visitOne: () => { },
-	// 		visitMany: function(leg) {
-	// 			manyNames.push(leg.name);
-	// 		}
-	// 	};
-
-	// 	span.legs.forEach(leg => leg.accept(c));
-
-	// 	return createRow;
-
-	// 	function createRow() {
-	// 		const obj = new ProtoRow();
-	// 		manyNames.forEach(name => {
-	// 			obj[name] = [];
-	// 		});
-	// 		return obj;
-	// 	}
-	// }
-
-	// function createProto(columns, span) {
-	// 	function ProtoRow() {
-	// 		columns.forEach(column => {
-	// 			this[column.alias] = null;
-	// 		});
-
-	// 		for (const key in span.aggregates) {
-	// 			this[key] = null;
-	// 		}
-
-	// 		const c = {
-	// 			visitJoin: (leg) => {
-	// 				this[leg.name] = null;
-	// 			},
-	// 			visitOne: (leg) => {
-	// 				this[leg.name] = null;
-	// 			},
-	// 			visitMany: (leg) => {
-	// 				this[leg.name] = null;
-	// 			}
-	// 		};
-
-	// 		span.legs.forEach(leg => leg.accept(c));
-	// 	}
-
-	// 	return ProtoRow;
-	// }
-
-
 	function hasManyRelations(span) {
 		let result;
 		const c = {};
@@ -11040,8 +10982,10 @@ function requireGetManyDto$1 () {
 
 			function updateParent(subRow) {
 				const key = extractKey(subRow);
-				const parentRow = extractFromMap(key);
-				parentRow[name].push(subRow);
+				const parentRows = extractFromMap(key) || [];
+				parentRows.forEach(parentRow => {
+					parentRow[name].push(subRow);
+				});
 			}
 		};
 
@@ -11125,22 +11069,29 @@ function requireGetManyDto$1 () {
 
 	function addToMap(map, values, row) {
 		if (Array.isArray(values)) {
-
+			let m = map;
 			const lastIndex = values.length - 1;
 			for (let i = 0; i < lastIndex; i++) {
 				const id = values[i];
-				if (map.has(id))
-					map = map.get(id);
-				else {
-					const next = new Map();
-					map.set(id, next);
-					map = next;
+				if (!m.has(id)) {
+					m.set(id, new Map());
 				}
+				m = m.get(id);
+			}
+			const leafKey = values[lastIndex];
+			if (!m.has(leafKey)) {
+				m.set(leafKey, [row]);
+			} else {
+				m.get(leafKey).push(row);
+			}
+		}
+		else {
+			if (!map.has(values)) {
+				map.set(values, [row]);
+			} else {
+				map.get(values).push(row);
 			}
-			map.set(values[lastIndex], row);
 		}
-		else
-			map.set(values, row);
 	}
 
 	function getFromMap(map, primaryColumns, values) {
@@ -11155,7 +11106,6 @@ function requireGetManyDto$1 () {
 			return map.get(values);
 	}
 
-
 	getManyDto_1$1 = getManyDto;
 	return getManyDto_1$1;
 }

package/dist/index.mjs

@@ -3854,10 +3854,9 @@ function requireLessThanOrEqual () {
 	hasRequiredLessThanOrEqual = 1;
 	var newBoolean = requireNewBoolean();
 	var encodeFilterArg = requireEncodeFilterArg();
-	const getSessionSingleton = requireGetSessionSingleton();
+	var quote = requireQuote$6();
 
 	function lessThanOrEqual(context, column,arg,alias) {
-		const quote = getSessionSingleton(context, 'quote');
 		var operator = '<=';
 		var encoded = encodeFilterArg(context, column, arg);
 		var firstPart = quote(context, alias) + '.' + quote(context, column._dbName) + operator;
@@ -10820,63 +10819,6 @@ function requireGetManyDto$2 () {
 		return obj;
 	}
 
-
-	// function newCreateRow(span) {
-	// 	const columnsMap = span.columns;
-	// 	const columns = span.table._columns.filter(column => !columnsMap || columnsMap.get(column));
-	// 	const ProtoRow = createProto(columns, span);
-	// 	const manyNames = [];
-
-	// 	const c = {
-	// 		visitJoin: () => { },
-	// 		visitOne: () => { },
-	// 		visitMany: function(leg) {
-	// 			manyNames.push(leg.name);
-	// 		}
-	// 	};
-
-	// 	span.legs.forEach(leg => leg.accept(c));
-
-	// 	return createRow;
-
-	// 	function createRow() {
-	// 		const obj = new ProtoRow();
-	// 		manyNames.forEach(name => {
-	// 			obj[name] = [];
-	// 		});
-	// 		return obj;
-	// 	}
-	// }
-
-	// function createProto(columns, span) {
-	// 	function ProtoRow() {
-	// 		columns.forEach(column => {
-	// 			this[column.alias] = null;
-	// 		});
-
-	// 		for (const key in span.aggregates) {
-	// 			this[key] = null;
-	// 		}
-
-	// 		const c = {
-	// 			visitJoin: (leg) => {
-	// 				this[leg.name] = null;
-	// 			},
-	// 			visitOne: (leg) => {
-	// 				this[leg.name] = null;
-	// 			},
-	// 			visitMany: (leg) => {
-	// 				this[leg.name] = null;
-	// 			}
-	// 		};
-
-	// 		span.legs.forEach(leg => leg.accept(c));
-	// 	}
-
-	// 	return ProtoRow;
-	// }
-
-
 	function hasManyRelations(span) {
 		let result;
 		const c = {};
@@ -11041,8 +10983,10 @@ function requireGetManyDto$2 () {
 
 			function updateParent(subRow) {
 				const key = extractKey(subRow);
-				const parentRow = extractFromMap(key);
-				parentRow[name].push(subRow);
+				const parentRows = extractFromMap(key) || [];
+				parentRows.forEach(parentRow => {
+					parentRow[name].push(subRow);
+				});
 			}
 		};
 
@@ -11126,22 +11070,29 @@ function requireGetManyDto$2 () {
 
 	function addToMap(map, values, row) {
 		if (Array.isArray(values)) {
-
+			let m = map;
 			const lastIndex = values.length - 1;
 			for (let i = 0; i < lastIndex; i++) {
 				const id = values[i];
-				if (map.has(id))
-					map = map.get(id);
-				else {
-					const next = new Map();
-					map.set(id, next);
-					map = next;
+				if (!m.has(id)) {
+					m.set(id, new Map());
 				}
+				m = m.get(id);
+			}
+			const leafKey = values[lastIndex];
+			if (!m.has(leafKey)) {
+				m.set(leafKey, [row]);
+			} else {
+				m.get(leafKey).push(row);
+			}
+		}
+		else {
+			if (!map.has(values)) {
+				map.set(values, [row]);
+			} else {
+				map.get(values).push(row);
 			}
-			map.set(values[lastIndex], row);
 		}
-		else
-			map.set(values, row);
 	}
 
 	function getFromMap(map, primaryColumns, values) {
@@ -11156,7 +11107,6 @@ function requireGetManyDto$2 () {
 			return map.get(values);
 	}
 
-
 	getManyDto_1$2 = getManyDto;
 	return getManyDto_1$2;
 }

package/docs/changelog.md

@@ -1,4 +1,6 @@
 ## Changelog
+__4.7.3__  
+Bugfix:  lessThanOrEqual throws incorrect syntax. See [#128](https://github.com/alfateam/issues/128)  
 __4.7.2__  
 Updated dependencies    
 __4.7.1__  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.7.3-beta.0",
+  "version": "4.7.3",
   "main": "./src/index.js",
   "module": "./dist/index.mjs",
   "browser": "./dist/index.browser.mjs",

package/src/getManyDto.js

@@ -76,63 +76,6 @@ function createProto(columns, span) {
 	return obj;
 }
 
-
-// function newCreateRow(span) {
-// 	const columnsMap = span.columns;
-// 	const columns = span.table._columns.filter(column => !columnsMap || columnsMap.get(column));
-// 	const ProtoRow = createProto(columns, span);
-// 	const manyNames = [];
-
-// 	const c = {
-// 		visitJoin: () => { },
-// 		visitOne: () => { },
-// 		visitMany: function(leg) {
-// 			manyNames.push(leg.name);
-// 		}
-// 	};
-
-// 	span.legs.forEach(leg => leg.accept(c));
-
-// 	return createRow;
-
-// 	function createRow() {
-// 		const obj = new ProtoRow();
-// 		manyNames.forEach(name => {
-// 			obj[name] = [];
-// 		});
-// 		return obj;
-// 	}
-// }
-
-// function createProto(columns, span) {
-// 	function ProtoRow() {
-// 		columns.forEach(column => {
-// 			this[column.alias] = null;
-// 		});
-
-// 		for (const key in span.aggregates) {
-// 			this[key] = null;
-// 		}
-
-// 		const c = {
-// 			visitJoin: (leg) => {
-// 				this[leg.name] = null;
-// 			},
-// 			visitOne: (leg) => {
-// 				this[leg.name] = null;
-// 			},
-// 			visitMany: (leg) => {
-// 				this[leg.name] = null;
-// 			}
-// 		};
-
-// 		span.legs.forEach(leg => leg.accept(c));
-// 	}
-
-// 	return ProtoRow;
-// }
-
-
 function hasManyRelations(span) {
 	let result;
 	const c = {};
@@ -297,8 +240,10 @@ async function decodeManyRelations(context, strategy, span) {
 
 		function updateParent(subRow) {
 			const key = extractKey(subRow);
-			const parentRow = extractFromMap(key);
-			parentRow[name].push(subRow);
+			const parentRows = extractFromMap(key) || [];
+			parentRows.forEach(parentRow => {
+				parentRow[name].push(subRow);
+			});
 		}
 	};
 
@@ -382,22 +327,29 @@ function createOneFilter(context, relation, ids) {
 
 function addToMap(map, values, row) {
 	if (Array.isArray(values)) {
-
+		let m = map;
 		const lastIndex = values.length - 1;
 		for (let i = 0; i < lastIndex; i++) {
 			const id = values[i];
-			if (map.has(id))
-				map = map.get(id);
-			else {
-				const next = new Map();
-				map.set(id, next);
-				map = next;
+			if (!m.has(id)) {
+				m.set(id, new Map());
 			}
+			m = m.get(id);
+		}
+		const leafKey = values[lastIndex];
+		if (!m.has(leafKey)) {
+			m.set(leafKey, [row]);
+		} else {
+			m.get(leafKey).push(row);
+		}
+	}
+	else {
+		if (!map.has(values)) {
+			map.set(values, [row]);
+		} else {
+			map.get(values).push(row);
 		}
-		map.set(values[lastIndex], row);
 	}
-	else
-		map.set(values, row);
 }
 
 function getFromMap(map, primaryColumns, values) {
@@ -412,5 +364,4 @@ function getFromMap(map, primaryColumns, values) {
 		return map.get(values);
 }
 
-
-module.exports = getManyDto;
+module.exports = getManyDto;

package/src/table/column/lessThanOrEqual.js

@@ -1,9 +1,8 @@
 var newBoolean = require('./newBoolean');
 var encodeFilterArg = require('./encodeFilterArg');
-const getSessionSingleton = require('../getSessionSingleton');
+var quote = require('../quote');
 
 function lessThanOrEqual(context, column,arg,alias) {
-	const quote = getSessionSingleton(context, 'quote');
 	var operator = '<=';
 	var encoded = encodeFilterArg(context, column, arg);
 	var firstPart = quote(context, alias) + '.' + quote(context, column._dbName) + operator;