orange-orm 4.3.0 → 4.4.0-beta.1

package/src/getManyDto.js

@@ -4,7 +4,7 @@ const negotiateRawSqlFilter = require('./table/column/negotiateRawSqlFilter');
 const strategyToSpan = require('./table/strategyToSpan');
 const executeQueries = require('./table/executeQueries');
 
-async function getManyDto(table, filter, strategy, spanFromParent) {
+async function getManyDto(table, filter, strategy, spanFromParent, updateParent) {
 	filter = negotiateRawSqlFilter(filter, table);
 	if (strategy && strategy.where) {
 		let arg = typeof strategy.where === 'function' ? strategy.where(table) : strategy.where;
@@ -16,7 +16,7 @@ async function getManyDto(table, filter, strategy, spanFromParent) {
 
 	const query = newQuery(table, filter, span, alias);
 	const res = await executeQueries([query]);
-	return decode(strategy, span, await res[0]);
+	return decode(strategy, span, await res[0], undefined, updateParent);
 }
 
 function newCreateRow(span) {
@@ -75,6 +75,63 @@ 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 = {};
@@ -92,7 +149,7 @@ function hasManyRelations(span) {
 	}
 }
 
-async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys(rows[0]) : []) {
+async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys(rows[0]) : [], updateParent) {
 	const table = span.table;
 	let columnsMap = span.columns;
 	const columns = table._columns.filter(column => !columnsMap || columnsMap.get(column));
@@ -132,9 +189,13 @@ async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys
 		}
 
 		outRows[i] = outRow;
+		// if (parentRows)
+		// 	parentRows[i][parentProp] = outRow;
+		if (updateParent)
+			updateParent(outRow, i);
 		if (shouldCreateMap) {
 			fkIds[i] = getIds(outRow);
-			addToMap(rowsMap, primaryColumns, outRow);
+			addToMap(rowsMap, fkIds[i], outRow);
 		}
 	}
 	span._rowsMap = rowsMap;
@@ -146,8 +207,12 @@ async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys
 
 	const all = [];
 
-	if (shouldCreateMap)
-		all.push(decodeManyRelations(strategy, span).then(() => decodeRelations2(strategy, span, rows, outRows, keys)));
+	if (shouldCreateMap) {
+		all.push(decodeManyRelations(strategy, span));
+		all.push(decodeRelations2(strategy, span, rows, outRows, keys));
+	}
+	// decodeRelations2(strategy, span, rows, outRows, keys);
+	// }
 	else
 		all.push(decodeRelations2(strategy, span, rows, outRows, keys));
 
@@ -185,18 +250,47 @@ async function decodeManyRelations(strategy, span) {
 		const name = leg.name;
 		const table = span.table;
 		const relation = table._relations[name];
-		const filter = createOneFilter(relation, span._ids);
 		const rowsMap = span._rowsMap;
-		const p = getManyDto(relation.childTable, filter, strategy[name], leg.span).then(subRows => {
-			for (let i = 0; i < subRows.length; i++) {
-				const key = leg.columns.map(column => subRows[i][column.alias]);
-				const parentRow = getFromMap(rowsMap, table._primaryColumns, key);
-				parentRow[name].push(subRows[i]);
-			}
-		});
+
+		const filter = createOneFilter(relation, span._ids);
+		const extractKey = createExtractKey(leg);
+		const extractFromMap = createExtractFromMap(rowsMap, table._primaryColumns);
+
+		const p = getManyDto(relation.childTable, filter, strategy[name], leg.span, updateParent);
+		// .then(subRows => {
+		// 	for (let i = 0; i < subRows.length; i++) {
+		// 		const key = extractKey(subRows[i]);
+		// 		const parentRow = extractFromMap(key);
+		// 		parentRow[name].push(subRows[i]);
+		// 	}
+		// });
+
+		function updateParent(subRow) {
+			const key = extractKey(subRow);
+			const parentRow = extractFromMap(key);
+			parentRow[name].push(subRow);
+		}
+
 		promises.push(p);
 	};
 
+	function createExtractKey(leg) {
+		if (leg.columns.length === 1) {
+			const alias = leg.columns[0].alias;
+			return (row) => row[alias];
+		}
+		else {
+			const aliases = leg.columns.map(column => column.alias);
+			return (row) => aliases.map(alias => row[alias]);
+		}
+	}
+	function createExtractFromMap(map, primaryColumns) {
+		if (primaryColumns.length === 1)
+			return (key) => map.get(key);
+		else
+			return getFromMap.bind(null, map, primaryColumns);
+	}
+
 	span.legs.forEach(onEachLeg);
 
 	function onEachLeg(leg) {
@@ -205,75 +299,30 @@ async function decodeManyRelations(strategy, span) {
 
 	await Promise.all(promises);
 }
-
 async function decodeRelations2(strategy, span, rawRows, resultRows, keys) {
-	const promises = [];
 	const c = {};
 	c.visitJoin = function(leg) {
 		const name = leg.name;
-		const p = decode(strategy[name], leg.span, rawRows, keys).then((rows) => {
-			for (let i = 0; i < rows.length; i++) {
-				resultRows[i][name] = rows[i];
-			}
-		});
-		promises.push(p);
+		return decode(strategy[name], leg.span, rawRows, keys, updateParent);
+
+		function updateParent(subRow, i) {
+			resultRows[i][name] = subRow;
+
+		}
 	};
 
 	c.visitOne = c.visitJoin;
-
 	c.visitMany = () => { };
 
-
-	span.legs.forEach(onEachLeg);
-
-	function onEachLeg(leg) {
-		leg.accept(c);
+	async function processLegsSequentially(legs) {
+		for (const leg of legs.toArray()) {
+			await leg.accept(c);
+		}
 	}
 
-	await Promise.all(promises);
+	await processLegsSequentially(span.legs);
 }
 
-
-// async function decodeRelations(strategy, span, rawRows, resultRows, keys) {
-// 	const promises = [];
-// 	const c = {};
-// 	c.visitJoin = function (leg) {
-// 		const name = leg.name;
-// 		const p = decode(strategy[name], leg.span, rawRows, keys).then((rows) => {
-// 			for (let i = 0; i < rows.length; i++) {
-// 				resultRows[i][name] = rows[i];
-// 			}
-// 		});
-// 		promises.push(p);
-// 	};
-
-// 	c.visitOne = c.visitJoin;
-
-// 	c.visitMany = function (leg) {
-// 		const name = leg.name;
-// 		const table = span.table;
-// 		const relation = table._relations[name];
-// 		const filter = createOneFilter(relation, span._ids);
-// 		const rowsMap = span._rowsMap;
-// 		const p = getManyDto(relation.childTable, filter, strategy[name], leg.span).then(subRows => {
-// 			for (let i = 0; i < subRows.length; i++) {
-// 				const key = leg.columns.map(column => subRows[i][column.alias]);
-// 				const parentRow = getFromMap(rowsMap, table._primaryColumns, key);
-// 				parentRow[name].push(subRows[i]);
-// 			}
-// 		});
-// 		promises.push(p);
-// 	};
-
-// 	span.legs.forEach(onEachLeg);
-
-// 	function onEachLeg(leg) {
-// 		leg.accept(c);
-// 	}
-
-// 	await Promise.all(promises);
-// }
-
 function createOneFilter(relation, ids) {
 	const columns = relation.joinRelation.columns;
 
@@ -299,28 +348,36 @@ function createOneFilter(relation, ids) {
 	}
 }
 
-function addToMap(map, primaryColumns, row) {
-
-	const lastIndex = primaryColumns.length - 1;
-	for (let i = 0; i < lastIndex; i++) {
-		const id = row[primaryColumns[i].alias];
-		if (map.has(id))
-			map = map.get(id);
-		else {
-			const next = new Map();
-			map.set(id, next);
-			map = next;
+function addToMap(map, values, row) {
+	if (Array.isArray(values)) {
+
+		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;
+			}
 		}
+		map.set(values[lastIndex], row);
 	}
-	map.set(row[primaryColumns[lastIndex].alias], row);
+	else
+		map.set(values, row);
 }
 
 function getFromMap(map, primaryColumns, values) {
-	const length = primaryColumns.length;
-	for (let i = 0; i < length; i++) {
-		map = map.get(values[i]);
+	if (Array.isArray(values)) {
+		const length = primaryColumns.length;
+		for (let i = 0; i < length; i++) {
+			map = map.get(values[i]);
+		}
+		return map;
 	}
-	return map;
+	else
+		return map.get(values);
 }
 
 

package/src/table/column/binary/newEncode.js

@@ -17,6 +17,10 @@ function _new(_column) {
 		return Buffer.from(value, 'base64');
 	};
 
+	encode.direct = function(value) {
+		return Buffer.from(value, 'base64');
+	};
+
 	return encode;
 }
 

package/src/table/column/boolean/newEncode.js

@@ -30,6 +30,12 @@ function _new(column) {
 		return encodeCore(value);
 	};
 
+	encode.direct = function(value) {
+		var encodeCore = getSessionSingleton('encodeBoolean');
+
+		return encodeCore(value);
+	};
+
 	return encode;
 }
 

package/src/table/column/date/newEncode.js

@@ -21,13 +21,18 @@ function _new(column) {
 		value = purify(value);
 		if (value == null) {
 			if (column.dbNull === null)
-				return newPara('null');
-			return newPara('\'' + column.dbNull + '\'');
+				'null';
+			return '\'' + column.dbNull + '\'';
 		}
 		var encodeCore = getSessionSingleton('encodeDate') || encodeDate;
 		return encodeCore(value);
 	};
 
+	encode.direct = function(value) {
+		var encodeCore = getSessionSingleton('encodeDate') || encodeDate;
+		return encodeCore(value);
+	};
+
 	return encode;
 
 

package/src/table/column/dateWithTimeZone/newEncode.js

@@ -23,6 +23,10 @@ function _new(column) {
 		return encodeDate(value);
 	};
 
+	encode.direct = function(value) {
+		return encodeDate(value);
+	};
+
 	return encode;
 
 

package/src/table/column/guid/newEncode.js

@@ -23,6 +23,10 @@ function _new(column) {
 		return '\'' + value + '\'';
 	};
 
+	encode.direct = function(value) {
+		return value ;
+	};
+
 
 	return encode;
 }

package/src/table/column/in.js

@@ -1,25 +1,22 @@
-var newParameterized = require('../query/newParameterized');
-var newBoolean = require('./newBoolean');
-var encodeFilterArg = require('./encodeFilterArg');
-var quote = require('../quote');
+const newParameterized = require('../query/newParameterized');
+const newBoolean = require('./newBoolean');
+const quote = require('../quote');
 
 function _in(column,values,alias) {
-	var filter;
+	let filter;
 	if (values.length === 0) {
 		filter =  newParameterized('1=2');
 		return newBoolean(filter);
 	}
-	var firstPart = quote(alias) + '.' + quote(column._dbName) + ' in ';
-	var parameterized = newParameterized(firstPart);
-	var separator = '(';
+	const firstPart = `${quote(alias)}.${quote(column._dbName)} in (`;
 
-	for (var i = 0; i < values.length; i++) {
-		var encoded = encodeFilterArg(column, values[i]);
-		parameterized = parameterized.append(separator).append(encoded);
-		separator = ',';
+	const encode = column.encode.direct;
+	const params = new Array(values.length);
+	for (let i = 0; i < values.length; i++) {
+		params[i] = encode(values[i]);
 	}
-	filter =  parameterized.append(')');
-	return newBoolean(filter);
+	const sql = `${firstPart +  new Array(values.length).fill('?').join(',')})`;
+	return newBoolean(newParameterized(sql, params));
 }
 
 module.exports = _in;

package/src/table/column/json/newEncode.js

@@ -35,6 +35,15 @@ function _new(column) {
 		return value;
 	};
 
+	encode.direct = function(value) {
+		var encodeCore = getSessionSingleton('encodeJSON');
+
+		if (encodeCore) {
+			value = encodeCore(value);
+		}
+		return value;
+	};
+
 	return encode;
 }
 

package/src/table/column/numeric/newEncode.js

@@ -19,7 +19,11 @@ module.exports = function(column) {
 			return '' + dbNull + '';
 		}
 		return '' + value;
+	};
 
+	encode.direct = function(value) {
+		return value ;
 	};
+
 	return encode;
 };

package/src/table/column/string/newEncode.js

@@ -14,7 +14,6 @@ function _new(column) {
 	};
 
 	encode.unsafe = function(value) {
-		value = purify(value);
 		value = purify(value);
 		if (value == null) {
 			if (column.dbNull === null)
@@ -24,6 +23,10 @@ function _new(column) {
 		return '\'' + value + '\'';
 	};
 
+	encode.direct = function(value) {
+		return value ;
+	};
+
 	return encode;
 
 }