orange-orm 5.3.0 → 5.3.2

package/dist/index.browser.mjs

@@ -2,7 +2,6 @@ void !function() {
 	typeof self === 'undefined' && typeof global === 'object'
 		? global.self = global : null;
 }();import * as fastJsonPatch from 'fast-json-patch';
-import * as uuid from 'uuid';
 import * as axios from 'axios';
 import * as _default from 'rfdc/default';
 import * as ajv from 'ajv';
@@ -973,7 +972,7 @@ function requireHostHono () {
 	return hostHono_1;
 }
 
-var require$$0$3 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(fastJsonPatch);
+var require$$0$2 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(fastJsonPatch);
 
 var dateToISOString_1;
 var hasRequiredDateToISOString;
@@ -1035,7 +1034,19 @@ function requireStringify () {
 	return stringify_1;
 }
 
-var require$$0$2 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(uuid);
+var newMemoryId;
+var hasRequiredNewMemoryId;
+
+function requireNewMemoryId () {
+	if (hasRequiredNewMemoryId) return newMemoryId;
+	hasRequiredNewMemoryId = 1;
+	let nextId = 1;
+
+	newMemoryId = function newMemoryId() {
+		return `tmp${nextId++}`;
+	};
+	return newMemoryId;
+}
 
 var createPatch;
 var hasRequiredCreatePatch;
@@ -1043,10 +1054,10 @@ var hasRequiredCreatePatch;
 function requireCreatePatch () {
 	if (hasRequiredCreatePatch) return createPatch;
 	hasRequiredCreatePatch = 1;
-	const jsonpatch = require$$0$3;
+	const jsonpatch = require$$0$2;
 	let dateToIsoString = requireDateToISOString();
 	let stringify = requireStringify();
-	let { v4: uuid } = require$$0$2;
+	let newMemoryId = requireNewMemoryId();
 
 	createPatch = function createPatch(original, dto, options) {
 		let subject = toCompareObject({ d: original }, options, true);
@@ -1155,7 +1166,7 @@ function requireCreatePatch () {
 
 		function negotiateTempKey(value) {
 			if (value === undefined)
-				return `~${uuid()}`;
+				return `~${newMemoryId()}`;
 			else
 				return value;
 		}
@@ -2972,7 +2983,7 @@ function requireToKeyPositionMap () {
 	if (hasRequiredToKeyPositionMap) return toKeyPositionMap_1;
 	hasRequiredToKeyPositionMap = 1;
 	const stringify = requireStringify();
-	const { v4: uuid } = require$$0$2;
+	const newMemoryId = requireNewMemoryId();
 
 	function toKeyPositionMap(rows, options) {
 		return rows.reduce((map, element, i) => {
@@ -2995,7 +3006,7 @@ function requireToKeyPositionMap () {
 
 	function negotiateTempKey(value) {
 		if (value === undefined)
-			return `~${uuid()}`;
+			return `~${newMemoryId()}`;
 		else
 			return value;
 	}
@@ -4257,7 +4268,7 @@ function requireClient () {
 					if (arguments[i][isColumnProxyKey])
 						args[i] = { [columnRefKey]: arguments[i][columnPathKey] };
 					else
-						args[i] = arguments[i](tableProxy(path.split('.').slice(0, -1).join('.')));
+						args[i] = arguments[i](tableProxy());
 				}
 				else
 					args[i] = arguments[i];
@@ -5599,7 +5610,7 @@ function requireNewEncode$5 () {
 			value = purify(value);
 			if (value == null) {
 				if (column.dbNull === null)
-					;
+					return 'null';
 				return '\'' + column.dbNull + '\'';
 			}
 			var encodeCore = getSessionSingleton(context, 'encodeDate') || encodeDate;
@@ -5734,12 +5745,12 @@ function requireNewEncode$4 () {
 					return 'null';
 				return '\'' + column.dbNull + '\'';
 			}
-			var encodeCore = getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDate') || encodeDate;
+			var encodeCore = getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDate') || encodeDate;
 			return encodeCore(value);
 		};
 
 		encode.direct = function(context, value) {
-			var encodeCore = getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDate') || encodeDate;
+			var encodeCore = getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDate') || encodeDate;
 			return encodeCore(value);
 		};
 
@@ -5943,7 +5954,7 @@ function requireNewEncode$2 () {
 			value = purify(value);
 			if (value == null) {
 				if (column.dbNull === null)
-					;
+					return 'null';
 				return '\'' + column.dbNull + '\'';
 			}
 			var encodeCore = getSessionSingleton(context, 'encodeBigint') || encodeBigint;
@@ -6292,18 +6303,13 @@ function requireColumn () {
 			return c;
 		};
 
-		c.date = function() {
-			requireDate()(column);
-			return c;
-		};
-
 		c.dateWithTimeZone = function() {
 			requireDateWithTimeZone()(column);
 			return c;
 		};
 
-		c.numeric = function(optionalPrecision,optionalScale) {
-			requireNumeric()(column,optionalPrecision,optionalScale);
+		c.numeric = function() {
+			requireNumeric()(column);
 			return c;
 		};
 
@@ -8899,6 +8905,10 @@ function requireDbRowToRow () {
 	function dbRowToRow(context, span, dbRow) {
 		var table = span.table;
 		var row = decodeDbRow(context, span, table, dbRow);
+		if (!hasPrimaryKey(row, table)) {
+			skipNestedLegs(span, dbRow);
+			return null;
+		}
 		var cache = table._cache;
 		if (!cache.tryGet(context, row)) {
 			var queryContext = span.queryContext;
@@ -8915,13 +8925,15 @@ function requireDbRowToRow () {
 		var c = {};
 
 		c.visitOne = function(leg) {
-			dbRowToRow(context, leg.span, dbRow);
-			leg.expand(row);
+			let child = dbRowToRow(context, leg.span, dbRow);
+			if (child)
+				leg.expand(row);
 		};
 
 		c.visitJoin = function(leg) {
-			dbRowToRow(context, leg.span, dbRow);
-			leg.expand(row);
+			let child = dbRowToRow(context, leg.span, dbRow);
+			if (child)
+				leg.expand(row);
 		};
 
 		c.visitMany = function() {
@@ -8936,6 +8948,33 @@ function requireDbRowToRow () {
 		return row;
 	}
 
+	function hasPrimaryKey(row, table) {
+		return table._primaryColumns.every((column) => {
+			let value = row[column.alias];
+			return value !== null && value !== undefined;
+		});
+	}
+
+	function skipNestedLegs(span, dbRow) {
+		span.legs.forEach((leg) => {
+			leg.accept({
+				visitOne() {
+					skipSpan(leg.span, dbRow);
+				},
+				visitJoin() {
+					skipSpan(leg.span, dbRow);
+				},
+				visitMany() {
+				}
+			});
+		});
+	}
+
+	function skipSpan(span, dbRow) {
+		decodeDbRow(undefined, span, span.table, dbRow);
+		skipNestedLegs(span, dbRow);
+	}
+
 	dbRowToRow_1 = dbRowToRow;
 	return dbRowToRow_1;
 }
@@ -10277,10 +10316,9 @@ function requireWhere$1 () {
 	function newWhere(_relations, _depth) {
 
 		function where(context, fn) {
-			const includeMany = false;
-			let { relations, alias } = extract(includeMany, _relations);
+			let { relations, alias } = extract(_relations);
 			const table = relations[relations.length - 1].childTable;
-			if (!relations[0].isMany || includeMany)
+			if (!relations[0].isMany)
 				table._rootAlias = alias;
 
 			try {
@@ -10296,11 +10334,11 @@ function requireWhere$1 () {
 		}
 		return where;
 
-		function extract(includeMany, relations) {
+		function extract(relations) {
 			let alias = relations[0].toLeg().table._dbName;
 			let result = [];
 			for (let i = 0; i < relations.length; i++) {
-				if (relations[i].isMany && !includeMany) {
+				if (relations[i].isMany) {
 					result = [relations[i]];
 					alias = relations[i].toLeg().table._dbName;
 				}
@@ -10327,10 +10365,9 @@ function requireAggregate$1 () {
 	function newAggregate(_relations) {
 
 		function aggregate(context, fn) {
-			const includeMany = false;
-			let { relations, alias } = extract(includeMany, _relations);
+			let { relations, alias } = extract(_relations);
 			const table = relations[relations.length - 1].childTable;
-			if (!relations[0].isMany || includeMany)
+			if (!relations[0].isMany)
 				table._rootAlias = alias;
 
 			try {
@@ -10345,11 +10382,11 @@ function requireAggregate$1 () {
 		}
 		return aggregate;
 
-		function extract(includeMany, relations) {
+		function extract(relations) {
 			let alias = relations[0].toLeg().table._dbName;
 			let result = [];
 			for (let i = 0; i < relations.length; i++) {
-				if (relations[i].isMany && !includeMany) {
+				if (relations[i].isMany) {
 					result = [relations[i]];
 					alias = relations[i].toLeg().table._dbName;
 				}
@@ -11010,7 +11047,7 @@ function requireNewManyCacheCore () {
 			}
 			var rows = newArray();
 			rows.push(childRow);
-			existing = cache.tryAdd(key, rows);
+			cache.tryAdd(key, rows);
 		}
 
 		function newArray() {
@@ -11047,8 +11084,7 @@ var hasRequiredNewId;
 function requireNewId () {
 	if (hasRequiredNewId) return newId;
 	hasRequiredNewId = 1;
-	const { v4 : uuid} = require$$0$2;
-	newId = uuid;
+	newId = requireNewMemoryId();
 	return newId;
 }
 
@@ -11736,16 +11772,18 @@ function requireGetManyDto$1 () {
 				outRow[column.alias] = column.decode(context, row[keys[j]]);
 			}
 
-			for (let j = 0; j < aggregateKeys.length; j++) {
-				const key = aggregateKeys[j];
-				const parse = span.aggregates[key].column?.decode || ((context, arg) => Number.parseFloat(arg));
-				outRow[key] = parse(context, row[keys[j + columnsLength]]);
+			if (outRow) {
+				for (let j = 0; j < aggregateKeys.length; j++) {
+					const key = aggregateKeys[j];
+					const parse = span.aggregates[key].column?.decode || ((context, arg) => Number.parseFloat(arg));
+					outRow[key] = parse(context, row[keys[j + columnsLength]]);
+				}
 			}
 
 			outRows[i] = outRow;
 			if (updateParent)
 				updateParent(outRow, i);
-			if (shouldCreateMap) {
+			if (shouldCreateMap && outRow) {
 				fkIds[i] = getIds(outRow);
 				addToMap(rowsMap, fkIds[i], outRow);
 			}
@@ -12432,7 +12470,7 @@ var hasRequiredApplyPatch;
 function requireApplyPatch () {
 	if (hasRequiredApplyPatch) return applyPatch_1;
 	hasRequiredApplyPatch = 1;
-	const fastjson = require$$0$3;
+	const fastjson = require$$0$2;
 	let fromCompareObject = requireFromCompareObject();
 	let toCompareObject = requireToCompareObject();
 	let getSessionSingleton = requireGetSessionSingleton();
@@ -12936,7 +12974,6 @@ function requirePatchTable () {
 				let result;
 				for (let i = 0; i < relation.columns.length; i++) {
 					let p = relation.columns[i].alias;
-					row[p];
 					result = await remove({ path: ['dummy', p], oldValue: (oldValue || {})[p], op, options: options }, table, row) || result;
 				}
 				return result || {};
@@ -12949,8 +12986,7 @@ function requirePatchTable () {
 					let p = relation.columns[i].alias;
 					let childKey = relation.childTable._primaryColumns[i].alias;
 					if (path[1] === childKey) {
-						row[p];
-						result = await remove({ path: ['dummy', p], oldValue: (oldValue || {})[p], op, options: options }, table, row) || result;
+						result = await remove({ path: ['dummy', p], oldValue: oldValue[p], op, options: options }, table, row) || result;
 						break;
 					}
 				}
@@ -16955,7 +16991,7 @@ function requireNewPgPool () {
 					if (!pg) {
 						pg = await import('pg');
 						pg  = pg.default || pg;
-						let types = pg.types || pg.types;
+						let types = pg.types;
 						types.setTypeParser(1700, function(val) {
 							return parseFloat(val);
 						});

package/dist/index.mjs

@@ -2,7 +2,6 @@ void !function() {
 	typeof self === 'undefined' && typeof global === 'object'
 		? global.self = global : null;
 }();import * as fastJsonPatch from 'fast-json-patch';
-import * as uuid from 'uuid';
 import * as axios from 'axios';
 import * as _default from 'rfdc/default';
 import * as ajv from 'ajv';
@@ -974,7 +973,7 @@ function requireHostHono () {
 	return hostHono_1;
 }
 
-var require$$0$4 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(fastJsonPatch);
+var require$$0$3 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(fastJsonPatch);
 
 var dateToISOString_1;
 var hasRequiredDateToISOString;
@@ -1036,7 +1035,19 @@ function requireStringify () {
 	return stringify_1;
 }
 
-var require$$0$3 = /*@__PURE__*/getDefaultExportFromNamespaceIfPresent(uuid);
+var newMemoryId;
+var hasRequiredNewMemoryId;
+
+function requireNewMemoryId () {
+	if (hasRequiredNewMemoryId) return newMemoryId;
+	hasRequiredNewMemoryId = 1;
+	let nextId = 1;
+
+	newMemoryId = function newMemoryId() {
+		return `tmp${nextId++}`;
+	};
+	return newMemoryId;
+}
 
 var createPatch;
 var hasRequiredCreatePatch;
@@ -1044,10 +1055,10 @@ var hasRequiredCreatePatch;
 function requireCreatePatch () {
 	if (hasRequiredCreatePatch) return createPatch;
 	hasRequiredCreatePatch = 1;
-	const jsonpatch = require$$0$4;
+	const jsonpatch = require$$0$3;
 	let dateToIsoString = requireDateToISOString();
 	let stringify = requireStringify();
-	let { v4: uuid } = require$$0$3;
+	let newMemoryId = requireNewMemoryId();
 
 	createPatch = function createPatch(original, dto, options) {
 		let subject = toCompareObject({ d: original }, options, true);
@@ -1156,7 +1167,7 @@ function requireCreatePatch () {
 
 		function negotiateTempKey(value) {
 			if (value === undefined)
-				return `~${uuid()}`;
+				return `~${newMemoryId()}`;
 			else
 				return value;
 		}
@@ -2973,7 +2984,7 @@ function requireToKeyPositionMap () {
 	if (hasRequiredToKeyPositionMap) return toKeyPositionMap_1;
 	hasRequiredToKeyPositionMap = 1;
 	const stringify = requireStringify();
-	const { v4: uuid } = require$$0$3;
+	const newMemoryId = requireNewMemoryId();
 
 	function toKeyPositionMap(rows, options) {
 		return rows.reduce((map, element, i) => {
@@ -2996,7 +3007,7 @@ function requireToKeyPositionMap () {
 
 	function negotiateTempKey(value) {
 		if (value === undefined)
-			return `~${uuid()}`;
+			return `~${newMemoryId()}`;
 		else
 			return value;
 	}
@@ -4258,7 +4269,7 @@ function requireClient () {
 					if (arguments[i][isColumnProxyKey])
 						args[i] = { [columnRefKey]: arguments[i][columnPathKey] };
 					else
-						args[i] = arguments[i](tableProxy(path.split('.').slice(0, -1).join('.')));
+						args[i] = arguments[i](tableProxy());
 				}
 				else
 					args[i] = arguments[i];
@@ -5600,7 +5611,7 @@ function requireNewEncode$5 () {
 			value = purify(value);
 			if (value == null) {
 				if (column.dbNull === null)
-					;
+					return 'null';
 				return '\'' + column.dbNull + '\'';
 			}
 			var encodeCore = getSessionSingleton(context, 'encodeDate') || encodeDate;
@@ -5735,12 +5746,12 @@ function requireNewEncode$4 () {
 					return 'null';
 				return '\'' + column.dbNull + '\'';
 			}
-			var encodeCore = getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDate') || encodeDate;
+			var encodeCore = getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDate') || encodeDate;
 			return encodeCore(value);
 		};
 
 		encode.direct = function(context, value) {
-			var encodeCore = getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDate') || encodeDate;
+			var encodeCore = getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDate') || encodeDate;
 			return encodeCore(value);
 		};
 
@@ -5944,7 +5955,7 @@ function requireNewEncode$2 () {
 			value = purify(value);
 			if (value == null) {
 				if (column.dbNull === null)
-					;
+					return 'null';
 				return '\'' + column.dbNull + '\'';
 			}
 			var encodeCore = getSessionSingleton(context, 'encodeBigint') || encodeBigint;
@@ -6293,18 +6304,13 @@ function requireColumn () {
 			return c;
 		};
 
-		c.date = function() {
-			requireDate()(column);
-			return c;
-		};
-
 		c.dateWithTimeZone = function() {
 			requireDateWithTimeZone()(column);
 			return c;
 		};
 
-		c.numeric = function(optionalPrecision,optionalScale) {
-			requireNumeric()(column,optionalPrecision,optionalScale);
+		c.numeric = function() {
+			requireNumeric()(column);
 			return c;
 		};
 
@@ -8900,6 +8906,10 @@ function requireDbRowToRow () {
 	function dbRowToRow(context, span, dbRow) {
 		var table = span.table;
 		var row = decodeDbRow(context, span, table, dbRow);
+		if (!hasPrimaryKey(row, table)) {
+			skipNestedLegs(span, dbRow);
+			return null;
+		}
 		var cache = table._cache;
 		if (!cache.tryGet(context, row)) {
 			var queryContext = span.queryContext;
@@ -8916,13 +8926,15 @@ function requireDbRowToRow () {
 		var c = {};
 
 		c.visitOne = function(leg) {
-			dbRowToRow(context, leg.span, dbRow);
-			leg.expand(row);
+			let child = dbRowToRow(context, leg.span, dbRow);
+			if (child)
+				leg.expand(row);
 		};
 
 		c.visitJoin = function(leg) {
-			dbRowToRow(context, leg.span, dbRow);
-			leg.expand(row);
+			let child = dbRowToRow(context, leg.span, dbRow);
+			if (child)
+				leg.expand(row);
 		};
 
 		c.visitMany = function() {
@@ -8937,6 +8949,33 @@ function requireDbRowToRow () {
 		return row;
 	}
 
+	function hasPrimaryKey(row, table) {
+		return table._primaryColumns.every((column) => {
+			let value = row[column.alias];
+			return value !== null && value !== undefined;
+		});
+	}
+
+	function skipNestedLegs(span, dbRow) {
+		span.legs.forEach((leg) => {
+			leg.accept({
+				visitOne() {
+					skipSpan(leg.span, dbRow);
+				},
+				visitJoin() {
+					skipSpan(leg.span, dbRow);
+				},
+				visitMany() {
+				}
+			});
+		});
+	}
+
+	function skipSpan(span, dbRow) {
+		decodeDbRow(undefined, span, span.table, dbRow);
+		skipNestedLegs(span, dbRow);
+	}
+
 	dbRowToRow_1 = dbRowToRow;
 	return dbRowToRow_1;
 }
@@ -10278,10 +10317,9 @@ function requireWhere$1 () {
 	function newWhere(_relations, _depth) {
 
 		function where(context, fn) {
-			const includeMany = false;
-			let { relations, alias } = extract(includeMany, _relations);
+			let { relations, alias } = extract(_relations);
 			const table = relations[relations.length - 1].childTable;
-			if (!relations[0].isMany || includeMany)
+			if (!relations[0].isMany)
 				table._rootAlias = alias;
 
 			try {
@@ -10297,11 +10335,11 @@ function requireWhere$1 () {
 		}
 		return where;
 
-		function extract(includeMany, relations) {
+		function extract(relations) {
 			let alias = relations[0].toLeg().table._dbName;
 			let result = [];
 			for (let i = 0; i < relations.length; i++) {
-				if (relations[i].isMany && !includeMany) {
+				if (relations[i].isMany) {
 					result = [relations[i]];
 					alias = relations[i].toLeg().table._dbName;
 				}
@@ -10328,10 +10366,9 @@ function requireAggregate$1 () {
 	function newAggregate(_relations) {
 
 		function aggregate(context, fn) {
-			const includeMany = false;
-			let { relations, alias } = extract(includeMany, _relations);
+			let { relations, alias } = extract(_relations);
 			const table = relations[relations.length - 1].childTable;
-			if (!relations[0].isMany || includeMany)
+			if (!relations[0].isMany)
 				table._rootAlias = alias;
 
 			try {
@@ -10346,11 +10383,11 @@ function requireAggregate$1 () {
 		}
 		return aggregate;
 
-		function extract(includeMany, relations) {
+		function extract(relations) {
 			let alias = relations[0].toLeg().table._dbName;
 			let result = [];
 			for (let i = 0; i < relations.length; i++) {
-				if (relations[i].isMany && !includeMany) {
+				if (relations[i].isMany) {
 					result = [relations[i]];
 					alias = relations[i].toLeg().table._dbName;
 				}
@@ -11011,7 +11048,7 @@ function requireNewManyCacheCore () {
 			}
 			var rows = newArray();
 			rows.push(childRow);
-			existing = cache.tryAdd(key, rows);
+			cache.tryAdd(key, rows);
 		}
 
 		function newArray() {
@@ -11048,8 +11085,7 @@ var hasRequiredNewId;
 function requireNewId () {
 	if (hasRequiredNewId) return newId;
 	hasRequiredNewId = 1;
-	const { v4 : uuid} = require$$0$3;
-	newId = uuid;
+	newId = requireNewMemoryId();
 	return newId;
 }
 
@@ -11737,16 +11773,18 @@ function requireGetManyDto$1 () {
 				outRow[column.alias] = column.decode(context, row[keys[j]]);
 			}
 
-			for (let j = 0; j < aggregateKeys.length; j++) {
-				const key = aggregateKeys[j];
-				const parse = span.aggregates[key].column?.decode || ((context, arg) => Number.parseFloat(arg));
-				outRow[key] = parse(context, row[keys[j + columnsLength]]);
+			if (outRow) {
+				for (let j = 0; j < aggregateKeys.length; j++) {
+					const key = aggregateKeys[j];
+					const parse = span.aggregates[key].column?.decode || ((context, arg) => Number.parseFloat(arg));
+					outRow[key] = parse(context, row[keys[j + columnsLength]]);
+				}
 			}
 
 			outRows[i] = outRow;
 			if (updateParent)
 				updateParent(outRow, i);
-			if (shouldCreateMap) {
+			if (shouldCreateMap && outRow) {
 				fkIds[i] = getIds(outRow);
 				addToMap(rowsMap, fkIds[i], outRow);
 			}
@@ -12433,7 +12471,7 @@ var hasRequiredApplyPatch;
 function requireApplyPatch () {
 	if (hasRequiredApplyPatch) return applyPatch_1;
 	hasRequiredApplyPatch = 1;
-	const fastjson = require$$0$4;
+	const fastjson = require$$0$3;
 	let fromCompareObject = requireFromCompareObject();
 	let toCompareObject = requireToCompareObject();
 	let getSessionSingleton = requireGetSessionSingleton();
@@ -12937,7 +12975,6 @@ function requirePatchTable () {
 				let result;
 				for (let i = 0; i < relation.columns.length; i++) {
 					let p = relation.columns[i].alias;
-					row[p];
 					result = await remove({ path: ['dummy', p], oldValue: (oldValue || {})[p], op, options: options }, table, row) || result;
 				}
 				return result || {};
@@ -12950,8 +12987,7 @@ function requirePatchTable () {
 					let p = relation.columns[i].alias;
 					let childKey = relation.childTable._primaryColumns[i].alias;
 					if (path[1] === childKey) {
-						row[p];
-						result = await remove({ path: ['dummy', p], oldValue: (oldValue || {})[p], op, options: options }, table, row) || result;
+						result = await remove({ path: ['dummy', p], oldValue: oldValue[p], op, options: options }, table, row) || result;
 						break;
 					}
 				}
@@ -18002,7 +18038,7 @@ function requireNewPgPool () {
 					if (!pg) {
 						pg = await import('pg');
 						pg  = pg.default || pg;
-						let types = pg.types || pg.types;
+						let types = pg.types;
 						types.setTypeParser(1700, function(val) {
 							return parseFloat(val);
 						});
@@ -18589,6 +18625,7 @@ function requireNewTransaction$7 () {
 			rdb.pool = pool;
 		}
 		rdb.engine = 'sqlite';
+		rdb.maxParameters = 32766;
 		rdb.encodeBoolean = encodeBoolean;
 		rdb.encodeBinary = encodeBinary;
 		rdb.decodeBinary = decodeBinary;
@@ -19022,6 +19059,7 @@ function requireNewTransaction$6 () {
 			rdb.pool = pool;
 		}
 		rdb.engine = 'sqlite';
+		rdb.maxParameters = 32766;
 		rdb.encodeBoolean = encodeBoolean;
 		rdb.encodeBinary = encodeBinary;
 		rdb.decodeBinary = decodeBinary;
@@ -19458,6 +19496,7 @@ function requireNewTransaction$5 () {
 			rdb.pool = pool;
 		}
 		rdb.engine = 'sqlite';
+		rdb.maxParameters = 32766;
 		rdb.encodeBoolean = encodeBoolean;
 		rdb.decodeJSON = decodeJSON;
 		rdb.encodeJSON = JSON.stringify;
@@ -20876,6 +20915,7 @@ function requireNewTransaction$3 () {
 			rdb.pool = pool;
 		}
 		rdb.engine = 'mssqlNative';
+		rdb.maxParameters = 2100;
 		rdb.encodeBoolean = encodeBoolean;
 		rdb.decodeJSON = decodeJSON;
 		rdb.encodeJSON = JSON.stringify;
@@ -21638,6 +21678,7 @@ function requireNewTransaction$2 () {
 			rdb.pool = pool;
 		}
 		rdb.engine = 'mssql';
+		rdb.maxParameters = 2100;
 		rdb.encodeBoolean = encodeBoolean;
 		rdb.decodeJSON = decodeJSON;
 		rdb.encodeJSON = JSON.stringify;
@@ -23206,6 +23247,7 @@ function requireNewTransaction () {
 
 		rdb.begin = 'SET TRANSACTION ISOLATION LEVEL READ COMMITTED';
 		rdb.engine = 'oracle';
+		rdb.maxParameters = 32768;
 		rdb.encodeBoolean = encodeBoolean;
 		rdb.decodeJSON = decodeJSON;
 		rdb.encodeJSON = JSON.stringify;

package/docs/changelog.md

@@ -1,4 +1,10 @@
 ## Changelog
+__5.3.2__  
+Removed uuid dependency.  
+Upgraded to tedious@19.2.1 to reduce transitive audit vulnerabilities in the MSSQL driver chain.  
+__5.3.1__  
+Fixes crashes in getById/getMany when a missing relation has nested hasMany/hasOne/references in the strategy. [#177](https://github.com/alfateam/orange-orm/issues/177)  
+Added max parameter chunking for getManyDto hasMany subqueries on MSSQL, SQLite and Oracle.  
 __5.3.0__  
 Support for MariaDB [#169](https://github.com/alfateam/orange-orm/issues/169)  
 __5.2.4__  

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "orange-orm",
-    "version": "5.3.0",
+    "version": "5.3.2",
     "publishConfig": {
         "access": "public"
     },
@@ -37,6 +37,7 @@
         "sap",
         "sapase",
         "Oracle",
+        "MariaDB",
         "rdb",
         "Orange ORM",
         "active record"
@@ -80,8 +81,7 @@
         "ajv": "^8.17.1",
         "axios": "^1.6.2",
         "fast-json-patch": "^3.1.1",
-        "rfdc": "^1.2.0",
-        "uuid": "^8.3.2 || ^9.0.0 || ^10.0.0 || ^11.1.0"
+        "rfdc": "^1.2.0"
     },
     "peerDependencies": {
         "@electric-sql/pglite": "^0.3.0",
@@ -91,7 +91,7 @@
         "oracledb": "^6.3.0",
         "pg": "^8.5.1",
         "pg-query-stream": "^3.3.2",
-        "tedious": "^15.1.2 || ^16.0.0 || ^18.1.0 || || ^19.0.0"
+        "tedious": "^15.1.2 || ^16.0.0 || ^18.1.0 || ^19.0.0"
     },
     "peerDependenciesMeta": {
         "pg": {
@@ -144,7 +144,7 @@
         "pg": "^8.5.1",
         "pg-query-stream": "^3.3.2",
         "rollup": "^2.52.7",
-        "tedious": "^19.0.0",
+        "tedious": "^19.2.1",
         "typescript": "^5.4.5",
         "vitest": "^3.2.4"
     },

package/src/bunSqlite/newTransaction.js

@@ -19,6 +19,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 		rdb.pool = pool;
 	}
 	rdb.engine = 'sqlite';
+	rdb.maxParameters = 32766;
 	rdb.encodeBoolean = encodeBoolean;
 	rdb.encodeBinary = encodeBinary;
 	rdb.decodeBinary = decodeBinary;
@@ -106,4 +107,4 @@ function decodeJSON(value) {
 	return JSON.parse(value);
 }
 
-module.exports = newResolveTransaction;
+module.exports = newResolveTransaction;

package/src/client/createPatch.js

@@ -1,7 +1,7 @@
 const jsonpatch = require('fast-json-patch');
 let dateToIsoString = require('../dateToISOString');
 let stringify = require('./stringify');
-let { v4: uuid } = require('uuid');
+let newMemoryId = require('../newMemoryId');
 
 module.exports = function createPatch(original, dto, options) {
 	let subject = toCompareObject({ d: original }, options, true);
@@ -110,7 +110,7 @@ module.exports = function createPatch(original, dto, options) {
 
 	function negotiateTempKey(value) {
 		if (value === undefined)
-			return `~${uuid()}`;
+			return `~${newMemoryId()}`;
 		else
 			return value;
 	}

package/src/client/index.js

@@ -1086,7 +1086,7 @@ function column(path, ...previous) {
 				if (arguments[i][isColumnProxyKey])
 					args[i] = { [columnRefKey]: arguments[i][columnPathKey] };
 				else
-					args[i] = arguments[i](tableProxy(path.split('.').slice(0, -1).join('.')));
+					args[i] = arguments[i](tableProxy());
 			}
 			else
 				args[i] = arguments[i];

package/src/client/toKeyPositionMap.js

@@ -1,5 +1,5 @@
 const stringify = require('./stringify');
-const { v4: uuid } = require('uuid');
+const newMemoryId = require('../newMemoryId');
 
 function toKeyPositionMap(rows, options) {
 	return rows.reduce((map, element, i) => {
@@ -22,9 +22,9 @@ function toKeyPositionMap(rows, options) {
 
 function negotiateTempKey(value) {
 	if (value === undefined)
-		return `~${uuid()}`;
+		return `~${newMemoryId()}`;
 	else
 		return value;
 }
 
-module.exports = toKeyPositionMap;
+module.exports = toKeyPositionMap;

package/src/getManyDto.js

@@ -126,16 +126,18 @@ async function decode(context, strategy, span, rows, keys = rows.length > 0 ? Ob
 			outRow[column.alias] = column.decode(context, row[keys[j]]);
 		}
 
-		for (let j = 0; j < aggregateKeys.length; j++) {
-			const key = aggregateKeys[j];
-			const parse = span.aggregates[key].column?.decode || ((context, arg) => Number.parseFloat(arg));
-			outRow[key] = parse(context, row[keys[j + columnsLength]]);
+		if (outRow) {
+			for (let j = 0; j < aggregateKeys.length; j++) {
+				const key = aggregateKeys[j];
+				const parse = span.aggregates[key].column?.decode || ((context, arg) => Number.parseFloat(arg));
+				outRow[key] = parse(context, row[keys[j + columnsLength]]);
+			}
 		}
 
 		outRows[i] = outRow;
 		if (updateParent)
 			updateParent(outRow, i);
-		if (shouldCreateMap) {
+		if (shouldCreateMap && outRow) {
 			fkIds[i] = getIds(outRow);
 			addToMap(rowsMap, fkIds[i], outRow);
 		}

package/src/mssql/newTransaction.js

@@ -19,6 +19,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 		rdb.pool = pool;
 	}
 	rdb.engine = 'mssqlNative';
+	rdb.maxParameters = 2100;
 	rdb.encodeBoolean = encodeBoolean;
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;
@@ -117,4 +118,4 @@ function decodeJSON(value){
 	return JSON.parse(value);
 }
 
-module.exports = newResolveTransaction;
+module.exports = newResolveTransaction;

package/src/newId.js

@@ -1,2 +1 @@
-const { v4 : uuid} = require('uuid');
-module.exports = uuid;
+module.exports = require('./newMemoryId');

package/src/newMemoryId.js

@@ -0,0 +1,5 @@
+let nextId = 1;
+
+module.exports = function newMemoryId() {
+	return `tmp${nextId++}`;
+};

package/src/nodeSqlite/newTransaction.js

@@ -19,6 +19,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 		rdb.pool = pool;
 	}
 	rdb.engine = 'sqlite';
+	rdb.maxParameters = 32766;
 	rdb.encodeBoolean = encodeBoolean;
 	rdb.encodeBinary = encodeBinary;
 	rdb.decodeBinary = decodeBinary;
@@ -106,4 +107,4 @@ function decodeJSON(value) {
 	return JSON.parse(value);
 }
 
-module.exports = newResolveTransaction;
+module.exports = newResolveTransaction;

package/src/oracle/newTransaction.js

@@ -21,6 +21,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 
 	rdb.begin = 'SET TRANSACTION ISOLATION LEVEL READ COMMITTED';
 	rdb.engine = 'oracle';
+	rdb.maxParameters = 32768;
 	rdb.encodeBoolean = encodeBoolean;
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;
@@ -110,4 +111,4 @@ function decodeJSON(value) {
 	return JSON.parse(value);
 }
 
-module.exports = newResolveTransaction;
+module.exports = newResolveTransaction;

package/src/patchTable.js

@@ -267,8 +267,6 @@ async function patchTableCore(context, table, patches, { strategy = undefined, d
 			let result;
 			for (let i = 0; i < relation.columns.length; i++) {
 				let p = relation.columns[i].alias;
-				let dto = {};
-				dto[p] = row[p];
 				result = await remove({ path: ['dummy', p], oldValue: (oldValue || {})[p], op, options: options }, table, row) || result;
 			}
 			return result || {};
@@ -281,9 +279,7 @@ async function patchTableCore(context, table, patches, { strategy = undefined, d
 				let p = relation.columns[i].alias;
 				let childKey = relation.childTable._primaryColumns[i].alias;
 				if (path[1] === childKey) {
-					let dto = {};
-					dto[p] = row[p];
-					result = await remove({ path: ['dummy', p], oldValue: (oldValue || {})[p], op, options: options }, table, row) || result;
+					result = await remove({ path: ['dummy', p], oldValue: oldValue[p], op, options: options }, table, row) || result;
 					break;
 				}
 			}

package/src/pg/pool/newPgPool.js

@@ -22,7 +22,7 @@ function newPgPool(connectionString, poolOptions) {
 				if (!pg) {
 					pg = await import('pg');
 					pg  = pg.default || pg;
-					let types = pg.types || pg.types;
+					let types = pg.types;
 					types.setTypeParser(1700, function(val) {
 						return parseFloat(val);
 					});

package/src/sqlite3/newTransaction.js

@@ -17,6 +17,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 		rdb.pool = pool;
 	}
 	rdb.engine = 'sqlite';
+	rdb.maxParameters = 32766;
 	rdb.encodeBoolean = encodeBoolean;
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;
@@ -102,4 +103,4 @@ function decodeJSON(value) {
 	return JSON.parse(value);
 }
 
-module.exports = newResolveTransaction;
+module.exports = newResolveTransaction;

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

@@ -21,7 +21,7 @@ function _new(column) {
 		value = purify(value);
 		if (value == null) {
 			if (column.dbNull === null)
-				'null';
+				return 'null';
 			return '\'' + column.dbNull + '\'';
 		}
 		var encodeCore = getSessionSingleton(context, 'encodeBigint') || encodeBigint;

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

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

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

@@ -23,12 +23,12 @@ function _new(column) {
 				return 'null';
 			return '\'' + column.dbNull + '\'';
 		}
-		var encodeCore = getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDate') || encodeDate;
+		var encodeCore = getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDate') || encodeDate;
 		return encodeCore(value);
 	};
 
 	encode.direct = function(context, value) {
-		var encodeCore = getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDate') || encodeDate;
+		var encodeCore = getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDate') || encodeDate;
 		return encodeCore(value);
 	};
 

package/src/table/column.js

@@ -28,18 +28,13 @@ function defineColumn(column, table) {
 		return c;
 	};
 
-	c.date = function() {
-		require('./column/date')(column);
-		return c;
-	};
-
 	c.dateWithTimeZone = function() {
 		require('./column/dateWithTimeZone')(column);
 		return c;
 	};
 
-	c.numeric = function(optionalPrecision,optionalScale) {
-		require('./column/numeric')(column,optionalPrecision,optionalScale);
+	c.numeric = function() {
+		require('./column/numeric')(column);
 		return c;
 	};
 

package/src/table/commands/newInsertAndForgetCommand.js

@@ -3,8 +3,8 @@ var newImmutable = require('../../newImmutable');
 var createPatch = require('../../client/createPatch');
 var createDto = require('../resultToRows/toDto/createDto');
 
-function newInsertCommand(table, row, options) {
-	return new InsertCommand(table, row, options);
+function newInsertCommand(table, row) {
+	return new InsertCommand(table, row);
 }
 
 function InsertCommand(table, row) {

package/src/table/relatedTable/aggregate.js

@@ -1,10 +1,9 @@
 function newAggregate(_relations) {
 
 	function aggregate(context, fn) {
-		const includeMany = false;
-		let { relations, alias } = extract(includeMany, _relations);
+		let { relations, alias } = extract(_relations);
 		const table = relations[relations.length - 1].childTable;
-		if (!relations[0].isMany || includeMany)
+		if (!relations[0].isMany)
 			table._rootAlias = alias;
 
 		try {
@@ -19,11 +18,11 @@ function newAggregate(_relations) {
 	}
 	return aggregate;
 
-	function extract(includeMany, relations) {
+	function extract(relations) {
 		let alias = relations[0].toLeg().table._dbName;
 		let result = [];
 		for (let i = 0; i < relations.length; i++) {
-			if (relations[i].isMany && !includeMany) {
+			if (relations[i].isMany) {
 				result = [relations[i]];
 				alias = relations[i].toLeg().table._dbName;
 			}

package/src/table/relatedTable/where.js

@@ -3,10 +3,9 @@ const negotiateRawSqlFilter = require('../column/negotiateRawSqlFilter');
 function newWhere(_relations, _depth) {
 
 	function where(context, fn) {
-		const includeMany = false;
-		let { relations, alias } = extract(includeMany, _relations);
+		let { relations, alias } = extract(_relations);
 		const table = relations[relations.length - 1].childTable;
-		if (!relations[0].isMany || includeMany)
+		if (!relations[0].isMany)
 			table._rootAlias = alias;
 
 		try {
@@ -22,11 +21,11 @@ function newWhere(_relations, _depth) {
 	}
 	return where;
 
-	function extract(includeMany, relations) {
+	function extract(relations) {
 		let alias = relations[0].toLeg().table._dbName;
 		let result = [];
 		for (let i = 0; i < relations.length; i++) {
-			if (relations[i].isMany && !includeMany) {
+			if (relations[i].isMany) {
 				result = [relations[i]];
 				alias = relations[i].toLeg().table._dbName;
 			}

package/src/table/relation/newManyCacheCore.js

@@ -23,7 +23,7 @@ function newManyCache(joinRelation) {
 		}
 		var rows = newArray();
 		rows.push(childRow);
-		existing = cache.tryAdd(key, rows);
+		cache.tryAdd(key, rows);
 	}
 
 	function newArray() {

package/src/table/resultToRows/dbRowToRow.js

@@ -4,6 +4,10 @@ var decodeDbRow = require('./decodeDbRow');
 function dbRowToRow(context, span, dbRow) {
 	var table = span.table;
 	var row = decodeDbRow(context, span, table, dbRow);
+	if (!hasPrimaryKey(row, table)) {
+		skipNestedLegs(span, dbRow);
+		return null;
+	}
 	var cache = table._cache;
 	if (!cache.tryGet(context, row)) {
 		var queryContext = span.queryContext;
@@ -20,13 +24,15 @@ function dbRowToRow(context, span, dbRow) {
 	var c = {};
 
 	c.visitOne = function(leg) {
-		dbRowToRow(context, leg.span, dbRow);
-		leg.expand(row);
+		let child = dbRowToRow(context, leg.span, dbRow);
+		if (child)
+			leg.expand(row);
 	};
 
 	c.visitJoin = function(leg) {
-		dbRowToRow(context, leg.span, dbRow);
-		leg.expand(row);
+		let child = dbRowToRow(context, leg.span, dbRow);
+		if (child)
+			leg.expand(row);
 	};
 
 	c.visitMany = function() {
@@ -41,4 +47,31 @@ function dbRowToRow(context, span, dbRow) {
 	return row;
 }
 
-module.exports = dbRowToRow;
+function hasPrimaryKey(row, table) {
+	return table._primaryColumns.every((column) => {
+		let value = row[column.alias];
+		return value !== null && value !== undefined;
+	});
+}
+
+function skipNestedLegs(span, dbRow) {
+	span.legs.forEach((leg) => {
+		leg.accept({
+			visitOne() {
+				skipSpan(leg.span, dbRow);
+			},
+			visitJoin() {
+				skipSpan(leg.span, dbRow);
+			},
+			visitMany() {
+			}
+		});
+	});
+}
+
+function skipSpan(span, dbRow) {
+	decodeDbRow(undefined, span, span.table, dbRow);
+	skipNestedLegs(span, dbRow);
+}
+
+module.exports = dbRowToRow;

package/src/tedious/newTransaction.js

@@ -19,6 +19,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 		rdb.pool = pool;
 	}
 	rdb.engine = 'mssql';
+	rdb.maxParameters = 2100;
 	rdb.encodeBoolean = encodeBoolean;
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;
@@ -114,4 +115,4 @@ function decodeJSON(value){
 	return JSON.parse(value);
 }
 
-module.exports = newResolveTransaction;
+module.exports = newResolveTransaction;

package/deno.lock

@@ -1,75 +0,0 @@
-{
-  "version": "5",
-  "specifiers": {
-    "jsr:@std/assert@*": "1.0.19",
-    "jsr:@std/assert@^1.0.17": "1.0.19",
-    "jsr:@std/internal@^1.0.12": "1.0.12",
-    "jsr:@std/path@*": "1.1.4",
-    "jsr:@std/testing@*": "1.0.17"
-  },
-  "jsr": {
-    "@std/assert@1.0.19": {
-      "integrity": "eaada96ee120cb980bc47e040f82814d786fe8162ecc53c91d8df60b8755991e",
-      "dependencies": [
-        "jsr:@std/internal"
-      ]
-    },
-    "@std/internal@1.0.12": {
-      "integrity": "972a634fd5bc34b242024402972cd5143eac68d8dffaca5eaa4dba30ce17b027"
-    },
-    "@std/path@1.1.4": {
-      "integrity": "1d2d43f39efb1b42f0b1882a25486647cb851481862dc7313390b2bb044314b5",
-      "dependencies": [
-        "jsr:@std/internal"
-      ]
-    },
-    "@std/testing@1.0.17": {
-      "integrity": "87bdc2700fa98249d48a17cd72413352d3d3680dcfbdb64947fd0982d6bbf681",
-      "dependencies": [
-        "jsr:@std/assert@^1.0.17",
-        "jsr:@std/internal"
-      ]
-    }
-  },
-  "workspace": {
-    "packageJson": {
-      "dependencies": [
-        "npm:@cloudflare/workers-types@^4.20241106.0",
-        "npm:@electric-sql/pglite@0.3",
-        "npm:@hono/node-server@^1.14.4",
-        "npm:@lroal/on-change@^4.0.2",
-        "npm:@rollup/plugin-commonjs@^28.0.2",
-        "npm:@rollup/plugin-json@^6.1.0",
-        "npm:@rollup/plugin-node-resolve@13",
-        "npm:@tediousjs/connection-string@~0.4.1",
-        "npm:@types/express@^4.17.13",
-        "npm:@types/oracledb@^6.0.4",
-        "npm:@types/tedious@^4.0.14",
-        "npm:@typescript-eslint/eslint-plugin@^8.56.1",
-        "npm:@typescript-eslint/parser@^8.56.1",
-        "npm:@vitest/coverage-v8@^3.2.4",
-        "npm:ajv@^8.17.1",
-        "npm:axios@^1.6.2",
-        "npm:better-sqlite3@^12.6.2",
-        "npm:cors@^2.8.5",
-        "npm:eslint-plugin-jest@^29.15.0",
-        "npm:eslint@^8.57.0",
-        "npm:express@^4.18.2",
-        "npm:fast-json-patch@^3.1.1",
-        "npm:hono@^4.8.2",
-        "npm:msnodesqlv8@^4.1.0",
-        "npm:mysql2@^3.9.4",
-        "npm:oracledb@^6.3.0",
-        "npm:owasp-dependency-check@^0.0.21",
-        "npm:pg-query-stream@^3.3.2",
-        "npm:pg@^8.5.1",
-        "npm:rfdc@^1.2.0",
-        "npm:rollup@^2.52.7",
-        "npm:tedious@19",
-        "npm:typescript@^5.4.5",
-        "npm:uuid@^8.3.2 || 9 || 10 || ^11.1.0",
-        "npm:vitest@^3.2.4"
-      ]
-    }
-  }
-}

package/src/table/query/extractLimitQuery.js

@@ -1,23 +0,0 @@
-var newWhereSql = require('./singleQuery/newWhereSql');
-var negotiateLimit = require('./singleQuery/negotiateLimit');
-var newParameterized = require('./newParameterized');
-var getSessionContext = require('../getSessionContext');
-
-function _new(table, filter, span, alias, orderBy, limit) {
-	//unused ?
-
-	if (!limit)
-		return;
-	var whereSql = newWhereSql(table, filter, alias);
-	var safeLimit = negotiateLimit(limit);
-	var sql;
-	if (getSessionContext().limit === 'TOP') {
-		safeLimit = safeLimit.replace('limit', 'top');
-		sql = 'select ' + safeLimit + ' * from ' + table._dbName + ' ' + alias + whereSql + orderBy;
-	}
-	sql = 'select * from ' + table._dbName + ' ' + alias + whereSql + orderBy + safeLimit;
-
-	return newParameterized(sql, filter.parameters);
-}
-
-module.exports = _new;