orange-orm 4.5.1-beta.3 → 4.5.2

package/src/index.js

@@ -2,8 +2,6 @@ const hostExpress = require('./hostExpress');
 const hostLocal = require('./hostLocal');
 const client = require('./client/index.js');
 const map = require('./client/map');
-const runtimes = require('./runtimes');
-
 let _mySql;
 let _pg;
 let _sqlite;
@@ -65,26 +63,15 @@ Object.defineProperty(connectViaPool, 'postgres', {
 Object.defineProperty(connectViaPool, 'pg', {
 	get: function() {
 		if (!_pg)
-			if (runtimes.bun)
-				_sqlite = require('./bunPg/newDatabase');
-			else
-				_pg = require('./pg/newDatabase');
+			_pg = require('./pg/newDatabase');
 		return _pg;
 	}
 });
 
 Object.defineProperty(connectViaPool, 'sqlite', {
 	get: function() {
-		if (!_sqlite) {
-			if (runtimes.deno || (runtimes.node && runtimes.node.major >= 22))
-				_sqlite = require('./nodeSqlite/newDatabase');
-			else if (runtimes.bun)
-				_sqlite = require('./bunSqlite/newDatabase');
-			else if (runtimes.node)
-				_sqlite = require('./sqlite3/newDatabase');
-			else
-				throw new Error('SQLite is not supported in this environment');
-		}
+		if (!_sqlite)
+			_sqlite = require('./sqlite/newDatabase');
 		return _sqlite;
 	}
 });

package/src/map.d.ts

@@ -664,23 +664,13 @@ type RelatedColumns<T> = RemoveNeverFlat<{
 	: never;
 }>;
 
-
 type AggregateColumns<T> = RemoveNeverFlat<{
-	[K in keyof T]:
-	T[K] extends ManyRelation
-	? AggregateColumns2<T[K]>
-	: T[K] extends RelatedTable
-	? AggregateColumns2<T[K]>
-	: never;
-}>;
-
-type AggregateColumns2<T> = RemoveNeverFlat<{
 	[K in keyof T]:
 	T[K] extends NumericColumnTypeDef<infer M> ? NumericColumnSymbol
 	: T[K] extends ManyRelation
-	? AggregateColumns2<T[K]>
+	? AggregateColumns<T[K]>
 	: T[K] extends RelatedTable
-	? AggregateColumns2<T[K]>
+	? AggregateColumns<T[K]>
 	: never;
 }>;
 

package/src/mssql/newTransaction.js

@@ -42,6 +42,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	};
 	rdb.aggregateCount = 0;
 	rdb.quote = quote;
+	rdb.cache = {};
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/mssql/pool/newGenericPool.js

@@ -3,7 +3,7 @@
 
 var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
-var mssql;
+var mssql = require('msnodesqlv8');
 
 function newGenericPool(connectionString, poolOptions) {
 	poolOptions = poolOptions || {};
@@ -12,14 +12,7 @@ function newGenericPool(connectionString, poolOptions) {
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
 		log: poolOptions.log || defaults.poolLog,
-		create: async function(cb) {
-			try {
-				if (!mssql)
-					mssql = await import('msnodesqlv8');
-			}
-			catch (err) {
-				return cb(err, null);
-			}
+		create: function(cb) {
 			var client;
 			mssql.open(connectionString, onConnected);
 

package/src/mySql/newTransaction.js

@@ -30,6 +30,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	};
 	rdb.aggregateCount = 0;
 	rdb.quote = quote;
+	rdb.cache = {};
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/mySql/pool/newGenericPool.js

@@ -2,7 +2,7 @@
 /* eslint-disable no-prototype-builtins */
 var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
-var mysql;
+var mysql = require('mysql2');
 
 function newGenericPool(connectionString, poolOptions) {
 	if (typeof connectionString === 'string')
@@ -15,16 +15,7 @@ function newGenericPool(connectionString, poolOptions) {
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
 		log: poolOptions.log,
-		create: async function(cb) {
-			try {
-				if(!mysql) {
-					mysql = await import('mysql2');
-					mysql = mysql.default || mysql;
-				}
-			}
-			catch(err) {
-				return cb(err, null);
-			}
+		create: function(cb) {
 			var innerPool = mysql.createPool(connectionString);
 			return cb(null, innerPool);
 			// innerPool.getConnection(onConnected);

package/src/oracle/newTransaction.js

@@ -37,6 +37,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	};
 	rdb.aggregateCount = 0;
 	rdb.quote = quote;
+	rdb.cache = {};
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/oracle/pool/newGenericPool.js

@@ -3,7 +3,10 @@
 
 var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
-var oracle;
+var oracle = require('oracledb');
+
+oracle.outFormat = oracle.OUT_FORMAT_OBJECT;
+oracle.fetchAsBuffer = [ oracle.BLOB ];
 
 function newGenericPool(connectionString, poolOptions) {
 	poolOptions = poolOptions || {};
@@ -12,19 +15,8 @@ function newGenericPool(connectionString, poolOptions) {
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
 		log: poolOptions.log,
-		create: async function(cb) {
+		create: function(cb) {
 			var client;
-			try {
-				if (!oracle) {
-					oracle = await import('oracledb');
-					oracle = oracle.default || oracle;
-					oracle.outFormat = oracle.OUT_FORMAT_OBJECT;
-					oracle.fetchAsBuffer = [ oracle.BLOB ];
-				}
-			}
-			catch (err) {
-				return cb(err, null);
-			}
 			oracle.getConnection(connectionString, onConnected);
 			function onConnected(err, _client) {
 				client = _client;

package/src/patchTable.js

@@ -3,13 +3,16 @@ let applyPatch = require('./applyPatch');
 let fromCompareObject = require('./fromCompareObject');
 let validateDeleteConflict = require('./validateDeleteConflict');
 let validateDeleteAllowed = require('./validateDeleteAllowed');
+let clearCache = require('./table/clearCache');
 
 async function patchTable() {
 	// const dryrun = true;
 	//traverse all rows you want to update before updatinng or inserting anything.
 	//this is to avoid page locks in ms sql
 	// await patchTableCore.apply(null, [...arguments, dryrun]);
-	return patchTableCore.apply(null, arguments);
+	const result = await  patchTableCore.apply(null, arguments);
+	clearCache(arguments[0]);
+	return result;
 }
 
 async function patchTableCore(context, table, patches, { strategy = undefined, deduceStrategy = false, ...options } = {}, dryrun) {

package/src/pg/newDatabase.js

@@ -11,6 +11,11 @@ let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
 let releaseDbClient = require('../table/releaseDbClient');
 let setSessionSingleton = require('../table/setSessionSingleton');
+let types = require('pg').types;
+
+types.setTypeParser(1700, function(val) {
+	return parseFloat(val);
+});
 
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)

package/src/pg/newTransaction.js

@@ -34,6 +34,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	};
 	rdb.aggregateCount = 0;
 	rdb.quote = quote;
+	rdb.cache = {};
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/pg/pool/newPgPool.js

@@ -4,11 +4,12 @@ var log = require('../../table/log');
 
 var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
-var pg;
+var _pg = require('pg');
 var parseSearchPathParam = require('./parseSearchPathParam');
 
 function newPgPool(connectionString, poolOptions) {
 	poolOptions = poolOptions || {};
+	let pg = poolOptions.native ? _pg.native : _pg;
 
 	// @ts-ignore
 	var pool = genericPool.Pool({
@@ -16,20 +17,7 @@ function newPgPool(connectionString, poolOptions) {
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
 		log: poolOptions.log,
-		create: async function(cb) {
-			try {
-				if (!pg) {
-					pg = await import('pg');
-					pg  = pg.default || pg;
-					let types = pg.types || pg.types;
-					types.setTypeParser(1700, function(val) {
-						return parseFloat(val);
-					});
-				}
-			}
-			catch(e) {
-				return cb(e, null);
-			}
+		create: function(cb) {
 			var client = new pg.Client(connectionString);
 			client.connect(function(err) {
 				if (err) return cb(err, null);

package/src/sap/newTransaction.js

@@ -42,6 +42,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	};
 	rdb.aggregateCount = 0;
 	rdb.quote = quote;
+	rdb.cache = {};
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/sqlite/newTransaction.js

@@ -31,6 +31,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 	};
 	rdb.aggregateCount = 0;
 	rdb.quote = quote;
+	rdb.cache = {};
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/{sqlite3 → sqlite}/pool/newGenericPool.js

@@ -2,7 +2,7 @@
 var defaults = require('../../poolDefaults');
 
 var genericPool = require('../../generic-pool');
-var sqlite;
+var sqlite = require('sqlite3');
 
 function newGenericPool(connectionString, poolOptions) {
 	poolOptions = poolOptions || {};
@@ -11,15 +11,7 @@ function newGenericPool(connectionString, poolOptions) {
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
 		log: poolOptions.log || defaults.poolLog,
-		create: async function(cb) {
-			try {
-				if (!sqlite)
-					sqlite = await import('sqlite3');
-				sqlite = sqlite.default || sqlite;
-			}
-			catch (err) {
-				return cb(err, null);
-			}
+		create: function(cb) {
 			var client = new sqlite.Database(connectionString, onConnected);
 
 			function onConnected(err) {

package/src/table/clearCache.js

@@ -0,0 +1,7 @@
+var setSessionSingleton = require('./setSessionSingleton');
+
+function clearCache(context) {
+	setSessionSingleton(context, 'cache', {});
+}
+
+module.exports = clearCache;

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

@@ -1,26 +1,15 @@
 var newDecodeCore = require('../newDecodeCore');
-var getSessionSingleton = require('../../getSessionSingleton');
 
 function _new(column) {
 	var decodeCore = newDecodeCore(column);
 
 	return function(context, value) {
-
-		var toBase64  = getSessionSingleton(context, 'decodeBinary') || toBase64Default;
-
 		value = decodeCore(context, value);
 		if (value === null)
 			return value;
-		else {
-			const ret = toBase64(value);
-			return ret;
-		}
+		else
+			return value.toString('base64');
 	};
 }
 
-function toBase64Default(buffer) {
-	return buffer.toString('base64');
-
-}
-
 module.exports = _new;

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

@@ -1,36 +1,26 @@
 var purify = require('./purify');
 var newParam = require('../../query/newParameterized');
-var getSessionSingleton = require('../../getSessionSingleton');
 
 function _new(_column) {
 
-	function encode(context, value) {
+	function encode(_context, value) {
 		value = purify(value);
 		if (value === null)
 			return newParam('null');
-
-		var encodeCore = getSessionSingleton(context, 'encodeBinary') || encodeDefault;
-		const enc = encodeCore(value);
-		return newParam('?', [enc]);
+		return newParam('?', [Buffer.from(value, 'base64')]);
 	}
-	encode.unsafe = function(context, value) {
+	encode.unsafe = function(_context, value) {
 		value = purify(value);
 		if (value === null)
 			return 'null';
-		var encodeCore = getSessionSingleton(context, 'encodeBinary') || encodeDefault;
-		return encodeCore(value);
+		return Buffer.from(value, 'base64');
 	};
 
-	encode.direct = function(context, value) {
-		var encodeCore = getSessionSingleton(context, 'encodeBinary') || encodeDefault;
-		return encodeCore(value);
+	encode.direct = function(_context, value) {
+		return Buffer.from(value, 'base64');
 	};
 
 	return encode;
 }
 
-function encodeDefault(base64) {
-	return Buffer.from(base64, 'base64');
-}
-
 module.exports = _new;

package/src/table/column/columnAggregate.js

@@ -0,0 +1,15 @@
+const getSessionSingleton = require('../getSessionSingleton');
+
+function columnAggregate(context, operator, column, table, coalesce = true) {
+	const quote = getSessionSingleton(context, 'quote');
+
+	const tableAlias = quote(table._rootAlias || table._dbName);
+	const columnName = quote(column._dbName);
+
+	return {
+		expression: (alias) => coalesce ? `COALESCE(${operator}(${tableAlias}.${columnName}), 0) as ${quote(alias)}` : `${operator}(${tableAlias}.${columnName}) as ${quote(alias)}`,
+		joins: ['']
+	};
+}
+
+module.exports = columnAggregate;

package/src/table/column/columnAggregateGroup.js

@@ -0,0 +1,35 @@
+var getSessionContext = require('../getSessionContext');
+var newJoinCore = require('../query/singleQuery/joinSql/newShallowJoinSqlCore');
+const getSessionSingleton = require('../getSessionSingleton');
+
+function columnAggregate(context, operator, column, table, coalesce = true) {
+	const quote = getSessionSingleton(context, 'quote');
+	const rdb = getSessionContext(context);
+	const outerAlias = 'y' + rdb.aggregateCount++;
+	const outerAliasQuoted = quote(outerAlias);
+	const alias = quote('x');
+	const foreignKeys = getForeignKeys(table);
+	const select = ` LEFT JOIN (SELECT ${foreignKeys},${operator}(${alias}.${quote(column._dbName)}) as amount`;
+	const onClause = createOnClause(context, table, outerAlias);
+	const from = ` FROM ${quote(table._dbName)} ${alias} GROUP BY ${foreignKeys}) ${outerAliasQuoted} ON (${onClause})`;
+	const join = select + from;
+
+	return {
+		expression: (alias) => coalesce ? `COALESCE(${outerAliasQuoted}.amount, 0) as ${quote(alias)}` : `${outerAliasQuoted}.amount as ${alias}`,
+		joins: [join]
+	};
+
+	function getForeignKeys(table) {
+		return table._primaryColumns.map(x => `${alias}.${quote(x._dbName)}`).join(',');
+	}
+}
+
+function createOnClause(context, table, rightAlias) {
+	let leftAlias = table._rootAlias || table._dbName;
+	const columns = table._primaryColumns;
+	return newJoinCore(context, table, columns, columns, leftAlias, rightAlias).sql();
+}
+
+
+
+module.exports = columnAggregate;

package/src/table/column/newColumn.js

@@ -7,6 +7,8 @@ const greaterThanOrEqual = require('./greaterThanOrEqual');
 const _in = require('./in');
 const _extractAlias = require('./extractAlias');
 const quote = require('../../table/quote');
+const aggregate = require('./columnAggregate');
+const aggregateGroup = require('./columnAggregateGroup');
 
 module.exports = function(table, name) {
 	var c = {};
@@ -76,6 +78,17 @@ module.exports = function(table, name) {
 	c.IN = c.in;
 	c.self = self;
 
+	c.groupSum = (context, ...rest) => aggregateGroup.apply(null, [context, 'sum', c, table, ...rest]);
+	c.groupAvg = (context, ...rest) => aggregateGroup.apply(null, [context, 'avg', c, table, ...rest]);
+	c.groupMin = (context, ...rest) => aggregateGroup.apply(null, [context, 'min', c, table, ...rest]);
+	c.groupMax = (context, ...rest) => aggregateGroup.apply(null, [context, 'max', c, table, ...rest]);
+	c.groupCount = (context, ...rest) => aggregateGroup.apply(null, [context, 'count', c, table, false, ...rest]);
+	c.sum = (context, ...rest) => aggregate.apply(null, [context, 'sum', c, table, ...rest]);
+	c.avg = (context, ...rest) => aggregate.apply(null, [context, 'avg', c, table, ...rest]);
+	c.min = (context, ...rest) => aggregate.apply(null, [context, 'min', c, table, ...rest]);
+	c.max = (context, ...rest) => aggregate.apply(null, [context, 'max', c, table, ...rest]);
+	c.count = (context, ...rest) => aggregate.apply(null, [context, 'count', c, table, false, ...rest]);
+
 	function self(context) {
 		const tableAlias = quote(context,table._rootAlias || table._dbName);
 		const columnName = quote(context, c._dbName);

package/src/table/getSessionCache.js

@@ -0,0 +1,8 @@
+const getSessionSingleton = require('./getSessionSingleton');
+
+function getSessionCache(context, id) {
+	const cache = getSessionSingleton(context, 'cache');
+	return cache[id];
+}
+
+module.exports = getSessionCache;

package/src/table/newRowCache.js

@@ -1,6 +1,6 @@
 let newCache = require('./newCache');
-let getSessionSingleton = require('./getSessionSingleton');
-let setSessionSingleton = require('./setSessionSingleton');
+let getSessionCache = require('./getSessionCache');
+let setSessionCache = require('./setSessionCache');
 
 function newRowCache(table) {
 	let id = Symbol();
@@ -38,11 +38,11 @@ function newRowCache(table) {
 
 
 function getCache(context, table, id) {
-	let cache = getSessionSingleton(context, id);
+	let cache = getSessionCache(context, id);
 	if (cache)
 		return cache;
 	cache = _newRowCache(table);
-	setSessionSingleton(context, id, cache);
+	setSessionCache(context, id, cache);
 	return cache;
 }
 

package/src/table/relatedTable/columnAggregate.js

@@ -11,7 +11,7 @@ function columnAggregate(context, operator, column, relations, coalesce = true)
 	const columnName = quote(column._dbName);
 
 	return {
-		expression: (alias) => coalesce ? `COALESCE(${operator}(${tableAlias}.${columnName}), 0) as ${quote(alias)}` : `${operator}(${tableAlias}.${columnName}) as ${alias}`,
+		expression: (alias) => coalesce ? `COALESCE(${operator}(${tableAlias}.${columnName}), 0) as ${quote(alias)}` : `${operator}(${tableAlias}.${columnName}) as ${quote(alias)}`,
 
 		joins: newJoinArray(context, relations)
 	};

package/src/table/relation/newManyCache.js

@@ -4,8 +4,8 @@ var synchronizeRemoved = require('./manyCache/synchronizeRemoved');
 var extractParentKey = require('./manyCache/extractParentKey');
 var newCacheCore = require('./newManyCacheCore');
 var newId = require('../../newId');
-var getSessionSingleton = require('../getSessionSingleton');
-var setSessionSingleton = require('../setSessionSingleton');
+var getSessionCache = require('../getSessionCache');
+var setSessionCache = require('../setSessionCache');
 
 function newManyCache(joinRelation) {
 	var c = {};
@@ -26,10 +26,10 @@ function newManyCache(joinRelation) {
 
 	c.getInnerCache = function(context) {
 		const theKey = negotiateKey();
-		var cache = getSessionSingleton(context, theKey);
+		var cache = getSessionCache(context, theKey);
 		if (!cache) {
 			cache = newCacheCore(joinRelation);
-			setSessionSingleton(context, theKey, cache);
+			setSessionCache(context, theKey, cache);
 			fillCache(context);
 			synchronizeAdded(context, c.tryAdd.bind(null, context), joinRelation);
 			synchronizeRemoved(context, c.tryRemove.bind(null, context), joinRelation);

package/src/table/resultToRows/newDecodeDbRow.js

@@ -207,7 +207,7 @@ function newDecodeDbRow(table, dbRow, filteredAliases, shouldValidate, isInsert)
 		for (let i = 0; i < numberOfColumns; i++) {
 			let index = offset + i;
 			let key = keys[index];
-			if (row[key] !== undefined && !isInsert)
+			if (row[key] !== undefined)
 				row[key] = columns[i].decode(context, row[key]);
 			if (shouldValidate && columns[i].validate)
 				columns[i].validate(row[key], row, isInsert);

package/src/table/setSessionCache.js

@@ -0,0 +1,8 @@
+const getSessionSingleton = require('./getSessionSingleton');
+
+function setSessionCache(context, id, value) {
+	const cache = getSessionSingleton(context, 'cache');
+	cache[id] = value;
+}
+
+module.exports = setSessionCache;

package/src/table/setSessionSingleton.js

@@ -1,4 +1,4 @@
-var getSessionContext = require('./getSessionContext');
+const getSessionContext = require('./getSessionContext');
 
 function setSessionSingleton(context, name, value) {
 	const rdb = getSessionContext(context);

package/src/tedious/newTransaction.js

@@ -44,6 +44,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	};
 	rdb.aggregateCount = 0;
 	rdb.quote = quote;
+	rdb.cache = {};
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/tedious/pool/newGenericPool.js

@@ -3,7 +3,7 @@
 
 var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
-var tedious;
+var tedious = require('tedious');
 var parseConnectionString = require('./parseConnectionString');
 
 function newGenericPool(connectionString, poolOptions) {
@@ -17,13 +17,7 @@ function newGenericPool(connectionString, poolOptions) {
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
 		log: poolOptions.log || defaults.poolLog,
-		create: async function(cb) {
-			try {
-				if (!tedious)
-					tedious = await import('tedious');
-			} catch (err) {
-				return cb(err, null);
-			}
+		create: function(cb) {
 			var client = new tedious.Connection(connectionString);
 			client.on('connect', onConnected);
 			client.connect();