orange-orm 4.5.0-beta.1 → 4.5.0-beta.2

package/src/getManyDto.js

@@ -3,11 +3,12 @@ const newQuery = require('./getManyDto/newQuery');
 const negotiateRawSqlFilter = require('./table/column/negotiateRawSqlFilter');
 const strategyToSpan = require('./table/strategyToSpan');
 const executeQueries = require('./table/executeQueries');
+const getSessionSingleton = require('./table/getSessionSingleton');
 
 async function getManyDto(context, table, filter, strategy, spanFromParent, updateParent) {
 	filter = negotiateRawSqlFilter(context, filter, table);
 	if (strategy && strategy.where) {
-		let arg = typeof strategy.where === 'function' ? strategy.where(context, table) : strategy.where;//todo
+		let arg = typeof strategy.where === 'function' ? strategy.where(context, table) : strategy.where;
 		filter = filter.and(context, arg);
 	}
 
@@ -179,7 +180,6 @@ async function decode(context, strategy, span, rows, keys = rows.length > 0 ? Ob
 				}
 			}
 			const column = columns[j];
-			//todo
 			outRow[column.alias] = column.decode(context, row[keys[j]]);
 		}
 
@@ -190,8 +190,6 @@ async function decode(context, strategy, span, rows, keys = rows.length > 0 ? Ob
 		}
 
 		outRows[i] = outRow;
-		// if (parentRows)
-		// 	parentRows[i][parentProp] = outRow;
 		if (updateParent)
 			updateParent(outRow, i);
 		if (shouldCreateMap) {
@@ -212,8 +210,6 @@ async function decode(context, strategy, span, rows, keys = rows.length > 0 ? Ob
 		all.push(decodeManyRelations(context, strategy, span));
 		all.push(decodeRelations2(context, strategy, span, rows, outRows, keys));
 	}
-	// decodeRelations2(strategy, span, rows, outRows, keys);
-	// }
 	else
 		all.push(decodeRelations2(context, strategy, span, rows, outRows, keys));
 
@@ -242,64 +238,99 @@ async function decode(context, strategy, span, rows, keys = rows.length > 0 ? Ob
 }
 
 async function decodeManyRelations(context, strategy, span) {
+	const maxParameters = getSessionSingleton(context, 'maxParameters');
+	const maxRows = maxParameters
+		? maxParameters * span.table._primaryColumns.length
+		: undefined;
+
 	const promises = [];
 	const c = {};
 	c.visitJoin = () => { };
 	c.visitOne = c.visitJoin;
 
+	// Helper function to split an array into chunks
+	function chunk(array, size) {
+		const results = [];
+		for (let i = 0; i < array.length; i += size) {
+			results.push(array.slice(i, i + size));
+		}
+		return results;
+	}
+
 	c.visitMany = function(leg) {
 		const name = leg.name;
 		const table = span.table;
 		const relation = table._relations[name];
 		const rowsMap = span._rowsMap;
 
-		const filter = createOneFilter(context, relation, span._ids);
 		const extractKey = createExtractKey(leg);
 		const extractFromMap = createExtractFromMap(rowsMap, table._primaryColumns);
 
-		const p = getManyDto(context, 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]);
-		// 	}
-		// });
+		// If maxRows is defined, chunk the IDs before calling getManyDto
+		if (maxRows) {
+			const chunkedIds = chunk(span._ids, maxRows);
+			for (const idsChunk of chunkedIds) {
+				const filter = createOneFilter(context, relation, idsChunk);
+				const p = getManyDto(
+					context,
+					relation.childTable,
+					filter,
+					strategy[name],
+					leg.span,
+					updateParent
+				);
+				promises.push(p);
+			}
+		} else {
+			// Otherwise, do the entire set in one go
+			const filter = createOneFilter(context, relation, span._ids);
+			const p = getManyDto(
+				context,
+				relation.childTable,
+				filter,
+				strategy[name],
+				leg.span,
+				updateParent
+			);
+			promises.push(p);
+		}
 
 		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 {
+		} else {
 			const aliases = leg.columns.map(column => column.alias);
 			return (row) => aliases.map(alias => row[alias]);
 		}
 	}
+
 	function createExtractFromMap(map, primaryColumns) {
-		if (primaryColumns.length === 1)
+		if (primaryColumns.length === 1) {
 			return (key) => map.get(key);
-		else
+		} else {
 			return getFromMap.bind(null, map, primaryColumns);
+		}
 	}
 
+	// Visit all legs
 	span.legs.forEach(onEachLeg);
 
 	function onEachLeg(leg) {
 		leg.accept(c);
 	}
 
+	// Wait until all promises resolve
 	await Promise.all(promises);
 }
+
 async function decodeRelations2(context, strategy, span, rawRows, resultRows, keys) {
 	const c = {};
 	c.visitJoin = function(leg) {

package/src/hostExpress/executePath.js

@@ -93,7 +93,8 @@ function _executePath(context, ...rest) {
 					if (isHttp)
 						validateArgs(json.args[0]);
 					const f = anyAllNone(context, x => parseFilter(json.args[0], x));
-					f.isSafe = isSafe;
+					if(!('isSafe' in f))
+						f.isSafe = isSafe;
 					return f;
 				}
 				else {

package/src/hostExpress.js

@@ -1,8 +1,8 @@
 const getTSDefinition = require('./getTSDefinition');
-let hostLocal = _hostLocal;
+// let hostLocal = _hostLocal;
 const getMeta = require('./hostExpress/getMeta');
 
-function hostExpress(client, options = {}) {
+function hostExpress(hostLocal, client, options = {}) {
 	if ('db' in options && (options.db ?? undefined) === undefined || !client.db)
 		throw new Error('No db specified');
 	const dbOptions = { db: options.db || client.db };
@@ -117,9 +117,4 @@ function hostExpress(client, options = {}) {
 	return handler;
 }
 
-function _hostLocal() {
-	hostLocal = require('./hostLocal');
-	return hostLocal.apply(null, arguments);
-}
-
 module.exports = hostExpress;

package/src/hostLocal.js

@@ -104,7 +104,7 @@ function hostLocal() {
 	}
 
 	function express(client, options) {
-		return hostExpress(client, options);
+		return hostExpress(hostLocal, client, options);
 	}
 
 	return c;

package/src/index.js

@@ -1,4 +1,5 @@
 const hostExpress = require('./hostExpress');
+const hostLocal = require('./hostLocal');
 const client = require('./client/index.js');
 const map = require('./client/map');
 let _mySql;
@@ -115,6 +116,6 @@ Object.defineProperty(connectViaPool, 'oracle', {
 	}
 });
 
-connectViaPool.express = hostExpress;
+connectViaPool.express = hostExpress.bind(null, hostLocal);
 
 module.exports = connectViaPool;

package/src/indexBrowser.js

@@ -0,0 +1,39 @@
+const hostExpress = require('./hostExpress');
+const hostLocal = require('./hostLocal');
+const client = require('./client/index.js');
+const map = require('./client/map');
+let _d1;
+
+var connectViaPool = function() {
+	return client.apply(null, arguments);
+};
+connectViaPool.createPatch = client.createPatch;
+connectViaPool.table = require('./table');
+connectViaPool.filter = require('./emptyFilter');
+connectViaPool.commit = require('./table/commit');
+connectViaPool.rollback = require('./table/rollback');
+connectViaPool.end = require('./pools').end;
+connectViaPool.log = require('./table/log').registerLogger;
+connectViaPool.on = require('./table/log').on;
+connectViaPool.off = require('./table/log').off;
+connectViaPool.query = require('./query');
+connectViaPool.lock = require('./lock');
+connectViaPool.schema = require('./pg/schema');
+connectViaPool.map = map.bind(null, connectViaPool);
+
+connectViaPool.http = function(url) {
+	return url;
+};
+
+
+Object.defineProperty(connectViaPool, 'd1', {
+	get: function() {
+		if (!_d1)
+			_d1 = require('./d1/newDatabase');
+		return _d1;
+	}
+});
+
+connectViaPool.express = hostExpress.bind(null, hostLocal);
+
+module.exports = connectViaPool;

package/src/mssql/newPool.js

@@ -1,4 +1,4 @@
-const promisify = require('node:util').promisify;
+const promisify = require('../promisify');
 var pools = require('../pools');
 var end = require('./pool/end');
 var newGenericPool = require('./pool/newGenericPool');

package/src/mssql/pool/newGenericPool.js

@@ -1,6 +1,5 @@
 // @ts-nocheck
 /* eslint-disable no-prototype-builtins */
-var EventEmitter = require('events').EventEmitter;
 
 var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
@@ -31,20 +30,9 @@ function newGenericPool(connectionString, poolOptions) {
 			client.close();
 		}
 	});
-	//mixin EventEmitter to pool
-	EventEmitter.call(pool);
-	for(var key in EventEmitter.prototype) {
-		if(EventEmitter.prototype.hasOwnProperty(key)) {
-			pool[key] = EventEmitter.prototype[key];
-		}
-	}
 	//monkey-patch with connect method
 	pool.connect = function(cb) {
-		var domain = process.domain;
 		pool.acquire(function(err, client) {
-			if(domain) {
-				cb = domain.bind(cb);
-			}
 			if(err)  return cb(err, null, function() {/*NOOP*/});
 			client.poolCount++;
 			cb(null, client, function(err) {

package/src/mySql/deleteFromSql.js

@@ -1,10 +1,10 @@
-var format = 'delete %s from %s as %s%s';
-var util = require('util');
+const format = 'delete %s from %s as %s%s';
+const formatString = require('../format');
 const quote = require('./quote');
 
 function deleteFromSql(table, alias, whereSql) {
-	var name = quote(table._dbName);
+	const name = quote(table._dbName);
 	alias = quote(alias);
-	return util.format(format, alias, name, alias, whereSql);
+	return formatString(format, alias, name, alias, whereSql);
 }
 module.exports = deleteFromSql;

package/src/mySql/newPool.js

@@ -1,4 +1,4 @@
-const promisify = require('node:util').promisify;
+const promisify = require('../promisify');
 const pools = require('../pools');
 const end = require('./pool/end');
 const newGenericPool = require('./pool/newGenericPool');

package/src/mySql/pool/newGenericPool.js

@@ -1,6 +1,5 @@
 // @ts-nocheck
 /* eslint-disable no-prototype-builtins */
-var EventEmitter = require('events').EventEmitter;
 var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
 var mysql = require('mysql2');
@@ -35,20 +34,9 @@ function newGenericPool(connectionString, poolOptions) {
 			client.end();
 		}
 	});
-	//mixin EventEmitter to pool
-	EventEmitter.call(pool);
-	for(var key in EventEmitter.prototype) {
-		if(EventEmitter.prototype.hasOwnProperty(key)) {
-			pool[key] = EventEmitter.prototype[key];
-		}
-	}
 	//monkey-patch with connect method
 	pool.connect = function(cb) {
-		var domain = process.domain;
 		pool.acquire(function(err, client) {
-			if(domain) {
-				cb = domain.bind(cb);
-			}
 			if(err)  return cb(err, null, function() {/*NOOP*/});
 			client.poolCount++;
 			cb(null, client, function(err) {

package/src/newId.js

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

package/src/oracle/deleteFromSql.js

@@ -1,10 +1,10 @@
-var format = 'delete from %s where %s.rowId in (SELECT %s.rowId FROM %s %s%s)';
-var util = require('util');
+const format = 'delete from %s where %s.rowId in (SELECT %s.rowId FROM %s %s%s)';
+const formatString = require('../format');
 const quote = require('./quote');
 
 function deleteFromSql(table, alias, whereSql) {
-	var name = quote(table._dbName);
+	const name = quote(table._dbName);
 	alias = quote(alias);
-	return util.format(format, name, name, alias, name, alias, whereSql);
+	return formatString(format, name, name, alias, name, alias, whereSql);
 }
 module.exports = deleteFromSql;

package/src/oracle/newInsertCommandCore.js

@@ -1,6 +1,6 @@
 var newParameterized = require('../table/query/newParameterized');
 var insertSql = require('./insertSql');
-var util = require('util');
+const formatString = require('../format');
 
 function newInsertCommandCore(context,table, row, options = {}) {
 	var parameters = [];
@@ -20,7 +20,7 @@ function newInsertCommandCore(context,table, row, options = {}) {
 		}
 	}
 
-	var sql = util.format.apply(null, values);
+	var sql = formatString.apply(null, values);
 	return newParameterized(sql, parameters);
 }
 

package/src/oracle/newPool.js

@@ -1,4 +1,4 @@
-const promisify = require('node:util').promisify;
+const promisify = require('../promisify');
 const pools = require('../pools');
 const end = require('./pool/end');
 const newGenericPool = require('./pool/newGenericPool');

package/src/oracle/pool/newGenericPool.js

@@ -1,6 +1,5 @@
 // @ts-nocheck
 /* eslint-disable no-prototype-builtins */
-var EventEmitter = require('events').EventEmitter;
 
 var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
@@ -33,20 +32,9 @@ function newGenericPool(connectionString, poolOptions) {
 			client.close();
 		}
 	});
-	//mixin EventEmitter to pool
-	EventEmitter.call(pool);
-	for (var key in EventEmitter.prototype) {
-		if (EventEmitter.prototype.hasOwnProperty(key)) {
-			pool[key] = EventEmitter.prototype[key];
-		}
-	}
 	//monkey-patch with connect method
 	pool.connect = function(cb) {
-		var domain = process.domain;
 		pool.acquire(function(err, client) {
-			if (domain) {
-				cb = domain.bind(cb);
-			}
 			if (err) return cb(err, null, function() {/*NOOP*/ });
 			client.poolCount++;
 			cb(null, client, function(err) {

package/src/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "uuid": "^11.0.5"
+  }
+}

package/src/pg/deleteFromSql.js

@@ -1,10 +1,10 @@
-var format = 'delete from %s %s%s';
-var util = require('util');
+const format = 'delete from %s %s%s';
+const formatString = require('../format');
 const quote = require('./quote');
 
 function deleteFromSql(table, alias, whereSql) {
-	var name = quote(table._dbName);
+	const name = quote(table._dbName);
 	alias = quote(alias);
-	return util.format(format, name, alias, whereSql);
+	return formatString(format, name, alias, whereSql);
 }
 module.exports = deleteFromSql;

package/src/pg/newPool.js

@@ -1,4 +1,4 @@
-const promisify = require('node:util').promisify;
+const promisify = require('../promisify');
 const pools = require('../pools');
 const end = require('./pool/end');
 const newPgPool = require('./pool/newPgPool');

package/src/pg/pool/newPgPool.js

@@ -1,7 +1,6 @@
 /* eslint-disable no-prototype-builtins */
 //slightly modified code from github.com/brianc/node-postgres
 var log = require('../../table/log');
-var EventEmitter = require('events').EventEmitter;
 
 var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
@@ -55,20 +54,9 @@ function newPgPool(connectionString, poolOptions) {
 			client.end();
 		}
 	});
-	//mixin EventEmitter to pool
-	EventEmitter.call(pool);
-	for (var key in EventEmitter.prototype) {
-		if (EventEmitter.prototype.hasOwnProperty(key)) {
-			pool[key] = EventEmitter.prototype[key];
-		}
-	}
 	//monkey-patch with connect method
 	pool.connect = function(cb) {
-		var domain = process.domain;
 		pool.acquire(function(err, client) {
-			if (domain) {
-				cb = domain.bind(cb);
-			}
 			if (err) return cb(err, null, function() {
 				/*NOOP*/
 			});

package/src/promisify.js

@@ -0,0 +1,24 @@
+function promisify(original) {
+	if (typeof original !== 'function') {
+		throw new TypeError('The "original" argument must be of type Function');
+	}
+
+	return function(...args) {
+		return new Promise((resolve, reject) => {
+			// Add the callback that Node-style APIs expect
+			function callback(err, ...values) {
+				if (err) {
+					return reject(err);
+				}
+				// If there's exactly one success value, return it;
+				// otherwise, return all values as an array.
+				return resolve(values.length > 1 ? values : values[0]);
+			}
+
+			// Call the original function, appending our callback
+			original.call(this, ...args, callback);
+		});
+	};
+}
+
+module.exports = promisify;

package/src/sap/deleteFromSql.js

@@ -1,10 +1,10 @@
 var format = 'delete from %s from %s as %s %s';
-var util = require('util');
+const formatString = require('../format');
 const quote = require('./quote');
 
 function deleteFromSql(table, alias, whereSql) {
 	var name = quote(table._dbName);
 	alias = quote(alias)	;
-	return util.format(format, name, name, alias, whereSql);
+	return formatString(format, name, name, alias, whereSql);
 }
 module.exports = deleteFromSql;

package/src/sap/newPool.js

@@ -1,4 +1,4 @@
-const promisify = require('node:util').promisify;
+const promisify = require('../promisify');
 var pools = require('../pools');
 var end = require('./pool/end');
 var newGenericPool = require('../mssql/pool/newGenericPool');

package/src/sqlite/deleteFromSql.js

@@ -1,10 +1,10 @@
-var format = 'delete from %s where %s.rowId in (SELECT %s.rowId FROM %s %s%s)';
-var util = require('util');
+const format = 'delete from %s where %s.rowId in (SELECT %s.rowId FROM %s %s%s)';
+const formatString = require('../format');
 const quote = require('./quote');
 
 function deleteFromSql(table, alias, whereSql) {
-	var name = quote(table._dbName);
+	const name = quote(table._dbName);
 	alias = quote(alias);
-	return util.format(format, name, name, alias, name, alias, whereSql);
+	return formatString(format, name, name, alias, name, alias, whereSql);
 }
 module.exports = deleteFromSql;

package/src/sqlite/newPool.js

@@ -1,4 +1,4 @@
-const promisify = require('node:util').promisify;
+const promisify = require('../promisify');
 const pools = require('../pools');
 const end = require('./pool/end');
 const newGenericPool = require('./pool/newGenericPool');

package/src/sqlite/pool/newGenericPool.js

@@ -1,6 +1,4 @@
 /* eslint-disable no-prototype-builtins */
-var EventEmitter = require('events').EventEmitter;
-
 var defaults = require('../../poolDefaults');
 
 var genericPool = require('../../generic-pool');
@@ -29,20 +27,9 @@ function newGenericPool(connectionString, poolOptions) {
 			client.close();
 		}
 	});
-	//mixin EventEmitter to pool
-	EventEmitter.call(pool);
-	for(var key in EventEmitter.prototype) {
-		if(EventEmitter.prototype.hasOwnProperty(key)) {
-			pool[key] = EventEmitter.prototype[key];
-		}
-	}
 	//monkey-patch with connect method
 	pool.connect = function(cb) {
-		var domain = process.domain;
 		pool.acquire(function(err, client) {
-			if(domain) {
-				cb = domain.bind(cb);
-			}
 			if(err)  return cb(err, null, function() {/*NOOP*/});
 			client.poolCount++;
 			cb(null, client, function(err) {

package/src/table/column/negotiateRawSqlFilter.js

@@ -1,74 +1,3 @@
-let newParameterized = function() {
-	newParameterized = require('../query/newParameterized');
-	return newParameterized.apply(null, arguments);
-};
-
-let newBoolean = function() {
-	newBoolean = require('./newBoolean');
-	return newBoolean.apply(null, arguments);
-};
-
-function negotiateRawSqlFilter(context, filter, optionalTable, emptyArrayMeansFalse) {
-	if (Array.isArray(filter) && filter.length === 0) {
-		const sql = emptyArrayMeansFalse ? '1 = 2' : '1 = 1';
-		return newBoolean(newParameterized(sql));
-	}
-	else if (Array.isArray(filter)) {
-		let curFilter;
-		let curObjectFilter;
-		for (let i = 0; i < filter.length; i++) {
-			let nextFilter = negotiateRawSqlFilter(context,filter[i], optionalTable);
-			if (nextFilter.isObjectFilter)
-				curObjectFilter = curObjectFilter ? curObjectFilter.or(context, nextFilter) : nextFilter;
-			else
-				curFilter = curFilter ? curFilter.and(context, nextFilter) : nextFilter;
-		}
-		if (curFilter && curObjectFilter)
-			return curFilter.and(context, curObjectFilter);
-		else if (curFilter)
-			return curFilter;
-		else
-			return curObjectFilter;
-	}
-	else {
-		let params = [];
-		if (filter) {
-			if (filter.and)
-				return filter;
-			if (filter.sql) {
-				let sql = filter.sql;
-				if (typeof filter.sql === 'function') {
-					sql = filter.sql();
-				}
-				params.push(sql, filter.parameters);
-			}
-			else if (isObjectFilter(filter, optionalTable))
-				return newObjectFilter(context, filter, optionalTable);
-			else
-				params = [filter];
-		} else {
-			params = [filter];
-		}
-
-		let parameterized = newParameterized.apply(null, params);
-		return newBoolean(parameterized);
-	}
-}
-
-function isObjectFilter(object, optionalTable) {
-	return optionalTable && object;
-}
-
-function newObjectFilter(context, object, table) {
-	let primaryColumns = table._primaryColumns;
-	let filter;
-	for (let i = 0; i < primaryColumns.length; i++) {
-		let column = primaryColumns[i];
-		let colFilter = column.equal(context, object[column.alias]);
-		filter = filter  ? filter.and(context, colFilter) : colFilter ;
-	}
-	filter.isObjectFilter = true;
-	return filter;
-}
+const { negotiateRawSqlFilter } = require('./utils');
 
 module.exports = negotiateRawSqlFilter;