orange-orm 5.3.0 → 5.3.1

package/dist/index.browser.mjs

@@ -4257,7 +4257,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 +5599,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 +5734,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 +5943,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 +6292,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 +8894,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 +8914,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 +8937,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 +10305,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 +10323,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 +10354,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 +10371,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 +11036,7 @@ function requireNewManyCacheCore () {
 			}
 			var rows = newArray();
 			rows.push(childRow);
-			existing = cache.tryAdd(key, rows);
+			cache.tryAdd(key, rows);
 		}
 
 		function newArray() {
@@ -11736,16 +11762,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);
 			}
@@ -12936,7 +12964,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 +12976,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 +16981,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

@@ -4258,7 +4258,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 +5600,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 +5735,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 +5944,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 +6293,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 +8895,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 +8915,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 +8938,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 +10306,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 +10324,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 +10355,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 +10372,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 +11037,7 @@ function requireNewManyCacheCore () {
 			}
 			var rows = newArray();
 			rows.push(childRow);
-			existing = cache.tryAdd(key, rows);
+			cache.tryAdd(key, rows);
 		}
 
 		function newArray() {
@@ -11737,16 +11763,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);
 			}
@@ -12937,7 +12965,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 +12977,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 +18028,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 +18615,7 @@ function requireNewTransaction$7 () {
 			rdb.pool = pool;
 		}
 		rdb.engine = 'sqlite';
+		rdb.maxParameters = 32766;
 		rdb.encodeBoolean = encodeBoolean;
 		rdb.encodeBinary = encodeBinary;
 		rdb.decodeBinary = decodeBinary;
@@ -19022,6 +19049,7 @@ function requireNewTransaction$6 () {
 			rdb.pool = pool;
 		}
 		rdb.engine = 'sqlite';
+		rdb.maxParameters = 32766;
 		rdb.encodeBoolean = encodeBoolean;
 		rdb.encodeBinary = encodeBinary;
 		rdb.decodeBinary = decodeBinary;
@@ -19458,6 +19486,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 +20905,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 +21668,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 +23237,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,7 @@
 ## Changelog
+__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.1",
     "publishConfig": {
         "access": "public"
     },
@@ -37,6 +37,7 @@
         "sap",
         "sapase",
         "Oracle",
+        "MariaDB",
         "rdb",
         "Orange ORM",
         "active record"

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/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/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/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/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;