orange-orm 4.4.2 → 4.5.0-beta.1

package/src/hostLocal.js

@@ -44,10 +44,10 @@ function hostLocal() {
 		}
 		return result;
 
-		async function fn() {
-			setSessionSingleton('ignoreSerializable', true);
+		async function fn(context) {
+			setSessionSingleton(context, 'ignoreSerializable', true);
 			let patch = body.patch;
-			result = await table.patch(patch, { ..._options, ...body.options, isHttp });
+			result = await table.patch(context, patch, { ..._options, ...body.options, isHttp });
 		}
 	}
 
@@ -72,10 +72,10 @@ function hostLocal() {
 		}
 		return result;
 
-		async function fn() {
-			setSessionSingleton('ignoreSerializable', true);
+		async function fn(context) {
+			setSessionSingleton(context, 'ignoreSerializable', true);
 			const options = { ..._options, ...body.options, JSONFilter: body, request, response, isHttp };
-			result = await executePath(options);
+			result = await executePath(context, options);
 		}
 	}
 	async function query() {
@@ -97,8 +97,8 @@ function hostLocal() {
 
 		return result;
 
-		async function fn() {
-			result = await executeQuery.apply(null, args);
+		async function fn(...args1) {
+			result = await executeQuery.apply(null, [...args1, ...args]);
 		}
 
 	}

package/src/index.d.ts

@@ -1,5 +1,6 @@
 import type { Options } from './ajv';
 import type { RequestHandler } from 'express';
+import type { D1Database } from '@cloudflare/workers-types';
 import type { ConnectionConfiguration } from 'tedious';
 import type { PoolAttributes } from 'oracledb';
 import type { AllowedDbMap, DbMapper, MappedDbDef } from './map';
@@ -10,6 +11,7 @@ declare namespace r {
 
     function table(name: string): Table;
     function end(): Promise<void>;
+    function d1(database: D1Database, options?: PoolOptions): Pool;
     function postgres(connectionString: string, options?: PoolOptions): Pool;
     function sqlite(connectionString: string, options?: PoolOptions): Pool;
     function sap(connectionString: string, options?: PoolOptions): Pool;

package/src/index.js

@@ -1,14 +1,14 @@
-var hostExpress = require('./hostExpress');
-var client = require('./client/index.js');
-var _mySql;
-var _pg;
-var _sqlite;
-var _mssqlNative;
-var _sap;
-var _mssql;
-var _oracle;
-var flags = require('./flags');
-var map = require('./client/map');
+const hostExpress = require('./hostExpress');
+const client = require('./client/index.js');
+const map = require('./client/map');
+let _mySql;
+let _pg;
+let _sqlite;
+let _mssqlNative;
+let _sap;
+let _mssql;
+let _oracle;
+let _d1;
 
 var connectViaPool = function(connectionString) {
 	if (connectionString.indexOf && connectionString.indexOf('mysql') === 0)
@@ -51,7 +51,6 @@ Object.defineProperty(connectViaPool, 'mySql', {
 		return _mySql;
 	}
 });
-
 Object.defineProperty(connectViaPool, 'postgres', {
 	get: function() {
 		if (!_pg)
@@ -76,6 +75,14 @@ Object.defineProperty(connectViaPool, 'sqlite', {
 	}
 });
 
+Object.defineProperty(connectViaPool, 'd1', {
+	get: function() {
+		if (!_d1)
+			_d1 = require('./d1/newDatabase');
+		return _d1;
+	}
+});
+
 Object.defineProperty(connectViaPool, 'mssqlNative', {
 	get: function() {
 		if (!_mssqlNative)
@@ -109,8 +116,5 @@ Object.defineProperty(connectViaPool, 'oracle', {
 });
 
 connectViaPool.express = hostExpress;
-connectViaPool.useHook = function(bool) {
-	flags.useHook = bool;
-};
 
 module.exports = connectViaPool;

package/src/map.d.ts

@@ -1,5 +1,6 @@
 import type { Options } from './ajv';
 import type { ConnectionConfiguration } from 'tedious';
+import type { D1Database } from '@cloudflare/workers-types';
 import type { PoolAttributes } from 'oracledb';
 import type { AxiosInterceptorManager, InternalAxiosRequestConfig, AxiosResponse } from 'axios';
 
@@ -29,6 +30,7 @@ type MappedDb<T> = {
 
 type DbConnectable<T> = {
 	http(url: string): MappedDbInstance<T>;
+	d1(database: D1Database): MappedDbInstance<T>;
 	postgres(connectionString: string, options?: PoolOptions): MappedDbInstance<T>;
 	sqlite(connectionString: string, options?: PoolOptions): MappedDbInstance<T>;
 	sap(connectionString: string, options?: PoolOptions): MappedDbInstance<T>;
@@ -59,6 +61,7 @@ type DbOptions<T> = {
 
 interface Connectors {
 	http(url: string): Pool;
+	d1(database: D1Database): Pool;
 	postgres(connectionString: string, options?: PoolOptions): Pool;
 	sqlite(connectionString: string, options?: PoolOptions): Pool;
 	sap(connectionString: string, options?: PoolOptions): Pool;

package/src/mssql/newDatabase.js

@@ -4,10 +4,6 @@ let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
-let useHook = require('../useHook');
-let promise = require('promise/domains');
-let versionArray = process.version.replace('v', '').split('.');
-let major = parseInt(versionArray[0]);
 let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
@@ -34,10 +30,6 @@ function newDatabase(connectionString, poolOptions) {
 
 		if (fn)
 			return domain.run(runInTransaction);
-		else if ((major >= 12) && useHook()) {
-			domain.exitContext = true;
-			return domain.start().then(run);
-		}
 		else
 			return domain.run(run);
 
@@ -46,67 +38,63 @@ function newDatabase(connectionString, poolOptions) {
 			let transaction = newTransaction(domain, pool, options);
 			await new Promise(transaction)
 				.then(begin)
-				.then(fn)
+				.then(() => fn(domain))
 				.then((res) => result = res)
-				.then(c.commit)
-				.then(null, c.rollback);
+				.then(() => c.commit(domain))
+				.then(null, (e) => c.rollback(domain, e));
 			return result;
 		}
 
 		function begin() {
-			return _begin(options?.readonly);
+			return _begin(domain, options);
 		}
 
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool, options);
-			if (useHook())
-				p = new Promise(transaction);
-			else
-				p = new promise(transaction);
+			p = new Promise(transaction);
 
 			return p.then(begin);
 		}
 
 	};
 
-	c.createTransaction = function() {
+	c.createTransaction = function(options) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
-		let p = domain.run(() => new Promise(transaction).then(_begin));
+		let p = domain.run(() => new Promise(transaction).then(begin));
 
 		function run(fn) {
 			return p.then(domain.run.bind(domain, fn));
 		}
-		return run;
-	};
 
-	c.bindTransaction = function() {
-		// @ts-ignore
-		var domain = process.domain;
-		let p = domain.run(() => true);
-
-		function run(fn) {
-			return p.then(domain.run.bind(domain, fn));
+		function begin() {
+			return _begin(domain, options);
 		}
+
+		run.rollback = rollback.bind(null, domain);
+		run.commit = commit.bind(null, domain);
+
 		return run;
+
+
 	};
 
 	c.query = function(query) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
 		let p = domain.run(() => new Promise(transaction)
-			.then(() => setSessionSingleton('changes', []))
-			.then(() => doQuery(query).then(onResult, onError)));
+			.then(() => setSessionSingleton(domain, 'changes', []))
+			.then(() => doQuery(domain, query).then(onResult, onError)));
 		return p;
 
 		function onResult(result) {
-			releaseDbClient();
+			releaseDbClient(domain);
 			return result;
 		}
 
 		function onError(e) {
-			releaseDbClient();
+			releaseDbClient(domain);
 			throw e;
 		}
 	};

package/src/mssql/newPool.js

@@ -1,5 +1,5 @@
+const promisify = require('node:util').promisify;
 var pools = require('../pools');
-var promise = require('../table/promise');
 var end = require('./pool/end');
 var newGenericPool = require('./pool/newGenericPool');
 var newId = require('../newId');
@@ -11,7 +11,7 @@ function newPool(connectionString, poolOptions) {
 	var c = {};
 
 	c.connect = pool.connect;
-	c.end = promise.denodeify(boundEnd);
+	c.end = promisify(boundEnd);
 	pools[id] = c;
 	return c;
 }

package/src/mssql/newTransaction.js

@@ -2,13 +2,14 @@ var wrapQuery = require('./wrapQuery');
 var encodeBoolean = require('../tedious/encodeBoolean');
 var deleteFromSql = require('../tedious/deleteFromSql');
 var selectForUpdateSql = require('../tedious/selectForUpdateSql');
-var outputInsertedSql = require('../tedious/outputInsertedSql');
 const limitAndOffset = require('../tedious/limitAndOffset');
 const formatDateOut = require('../tedious/formatDateOut');
+const formatJSONOut = require('../tedious/formatJSONOut');
 const insertSql = require('../tedious/insertSql');
 const insert = require('../tedious/insert');
+const quote = require('../tedious/quote');
 
-function newResolveTransaction(domain, pool, { readonly } = {}) {
+function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	var rdb = {poolFactory: pool};
 	if (!pool.connect) {
 		pool = pool();
@@ -19,9 +20,9 @@ function newResolveTransaction(domain, pool, { readonly } = {}) {
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;
 	rdb.formatDateOut = formatDateOut;
+	rdb.formatJSONOut = formatJSONOut;
 	rdb.deleteFromSql = deleteFromSql;
 	rdb.selectForUpdateSql = selectForUpdateSql;
-	rdb.outputInsertedSql = outputInsertedSql;
 	rdb.insertSql = insertSql;
 	rdb.insert = insert;
 	rdb.lastInsertedIsSeparate = false;
@@ -40,7 +41,7 @@ function newResolveTransaction(domain, pool, { readonly } = {}) {
 		caller.visitSqlite();
 	};
 	rdb.aggregateCount = 0;
-	rdb.quote = (name) => `[${name}]`;
+	rdb.quote = quote;
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/mssql/pool/newGenericPool.js

@@ -2,7 +2,7 @@
 /* eslint-disable no-prototype-builtins */
 var EventEmitter = require('events').EventEmitter;
 
-var defaults = require('./defaults');
+var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
 var mssql = require('msnodesqlv8');
 

package/src/mySql/deleteFromSql.js

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

package/src/mySql/insert.js

@@ -5,16 +5,16 @@ let executeQueries = require('../table/executeQueries');
 let pushCommand = require('../table/commands/pushCommand');
 
 
-function insertDefault(table, row, options) {
+function insertDefault(context, table, row, options) {
 	let commands = [];
-	let insertCmd = newInsertCommand(newInsertCommandCore, table, row, options);
+	let insertCmd = newInsertCommand(newInsertCommandCore.bind(null, context), table, row, options);
 	insertCmd.disallowCompress = true;
-	pushCommand(insertCmd);
+	pushCommand(context, insertCmd);
 
-	let selectCmd = newGetLastInsertedCommand(table, row, insertCmd);
+	let selectCmd = newGetLastInsertedCommand(context, table, row, insertCmd);
 	commands.push(selectCmd);
 
-	return executeQueries(commands).then((result) => result[result.length - 1]);
+	return executeQueries(context, commands).then((result) => result[result.length - 1]);
 
 }
 

package/src/mySql/insertSql.js

@@ -1,7 +1,6 @@
-const getSessionSingleton = require('../table/getSessionSingleton');
+const quote = require('./quote');
 
-function insertSql(table, row, options) {
-	const quote = getSessionSingleton('quote');
+function insertSql(_context, table, row, options) {
 	let columnNames = [];
 	let regularColumnNames = [];
 	let conflictColumnUpdateSql = '';

package/src/mySql/lastInsertedSql.js

@@ -1,13 +1,12 @@
-const getSessionSingleton = require('../table/getSessionSingleton');
+const quote = require('./quote');
 
-function lastInsertedSql(table, keyValues) {
-	const quote = getSessionSingleton('quote');
+function lastInsertedSql(context,table, keyValues) {
 	return keyValues.map((value,i) => {
 		let column = table._primaryColumns[i];
 		if (value === undefined && column.tsType === 'NumberColumn')
 			return `${quote(column._dbName)}=LAST_INSERT_ID()`;
 		else
-			return column.eq(value);
+			return column.eq(context, value);
 	});
 }
 

package/src/mySql/newDatabase.js

@@ -4,10 +4,6 @@ let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
-let useHook = require('../useHook');
-let promise = require('promise/domains');
-let versionArray = process.version.replace('v', '').split('.');
-let major = parseInt(versionArray[0]);
 let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
@@ -19,11 +15,11 @@ function newDatabase(connectionString, poolOptions) {
 		throw new Error('Connection string cannot be empty');
 	var pool;
 	if (!poolOptions)
-		pool = newPool.bind(null,connectionString, poolOptions);
+		pool = newPool.bind(null, connectionString, poolOptions);
 	else
 		pool = newPool(connectionString, poolOptions);
 
-	let c = {poolFactory: pool, hostLocal, express};
+	let c = { poolFactory: pool, hostLocal, express };
 
 	c.transaction = function(options, fn) {
 		if ((arguments.length === 1) && (typeof options === 'function')) {
@@ -34,10 +30,7 @@ function newDatabase(connectionString, poolOptions) {
 
 		if (fn)
 			return domain.run(runInTransaction);
-		else if ((major >= 12) && useHook()) {
-			domain.exitContext = true;
-			return domain.start().then(run);
-		} else
+		else
 			return domain.run(run);
 
 		async function runInTransaction() {
@@ -45,67 +38,60 @@ function newDatabase(connectionString, poolOptions) {
 			let transaction = newTransaction(domain, pool, options);
 			await new Promise(transaction)
 				.then(begin)
-				.then(fn)
+				.then(() => fn(domain))
 				.then((res) => result = res)
-				.then(c.commit)
-				.then(null, c.rollback);
+				.then(() => commit(domain))
+				.then(null, (e) => rollback(domain, e));
 			return result;
 		}
 
 		function begin() {
-			return _begin(options?.readonly);
+			return _begin(domain, options);
 		}
 
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool, options);
-			if (useHook())
-				p = new Promise(transaction);
-			else
-				p = new promise(transaction);
+			p = new Promise(transaction);
 
 			return p.then(begin);
 		}
 
 	};
 
-	c.createTransaction = function() {
+	c.createTransaction = function(options) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
-		let p = domain.run(() => new Promise(transaction).then(_begin));
+		let p = domain.run(() => new Promise(transaction).then(begin));
 
 		function run(fn) {
-			return p.then(domain.run.bind(domain, fn));
+			return p.then(() => fn(domain));
 		}
+		run.rollback = rollback.bind(null, domain);
+		run.commit = commit.bind(null, domain);
 		return run;
-	};
 
-	c.bindTransaction = function() {
-		// @ts-ignore
-		var domain = process.domain;
-		let p = domain.run(() => true);
-
-		function run(fn) {
-			return p.then(domain.run.bind(domain, fn));
+		function begin() {
+			return _begin(domain, options);
 		}
-		return run;
 	};
 
+
 	c.query = function(query) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
 		let p = domain.run(() => new Promise(transaction)
-			.then(() => setSessionSingleton('changes', []))
-			.then(() => doQuery(query).then(onResult, onError)));
+			.then(() => setSessionSingleton(domain, 'changes', []))
+			.then(() => doQuery(domain, query).then(onResult, onError)));
 		return p;
 
 		function onResult(result) {
-			releaseDbClient();
+			releaseDbClient(domain);
 			return result;
 		}
 
 		function onError(e) {
-			releaseDbClient();
+			releaseDbClient(domain);
 			throw e;
 		}
 	};

package/src/mySql/newPool.js

@@ -1,17 +1,17 @@
-var pools = require('../pools');
-var promise = require('../table/promise');
-var end = require('./pool/end');
-var newGenericPool = require('./pool/newGenericPool');
-var newId = require('../newId');
+const promisify = require('node:util').promisify;
+const pools = require('../pools');
+const end = require('./pool/end');
+const newGenericPool = require('./pool/newGenericPool');
+const newId = require('../newId');
 
 function newPool(connectionString, poolOptions) {
-	var pool = newGenericPool(connectionString, poolOptions);
-	var id = newId();
-	var boundEnd = end.bind(null, pool, id);
-	var c = {};
+	let pool = newGenericPool(connectionString, poolOptions);
+	let id = newId();
+	let boundEnd = end.bind(null, pool, id);
+	let c = {};
 
 	c.connect = pool.connect;
-	c.end = promise.denodeify(boundEnd);
+	c.end = promisify(boundEnd);
 	pools[id] = c;
 	return c;
 }

package/src/mySql/newTransaction.js

@@ -6,8 +6,9 @@ const lastInsertedSql = require('./lastInsertedSql');
 const limitAndOffset = require('./limitAndOffset');
 const insertSql = require('./insertSql');
 const insert = require('./insert');
+const quote = require('./quote');
 
-function newResolveTransaction(domain, pool, { readonly } = {}) {
+function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	var rdb = {poolFactory: pool};
 	if (!pool.connect) {
 		pool = pool();
@@ -28,8 +29,7 @@ function newResolveTransaction(domain, pool, { readonly } = {}) {
 		caller.visitMySql();
 	};
 	rdb.aggregateCount = 0;
-	rdb.quote = (name) => `\`${name}\``;
-
+	rdb.quote = quote;
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/mySql/pool/newGenericPool.js

@@ -1,8 +1,7 @@
 // @ts-nocheck
 /* eslint-disable no-prototype-builtins */
 var EventEmitter = require('events').EventEmitter;
-
-var defaults = require('./defaults');
+var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
 var mysql = require('mysql2');
 
@@ -16,7 +15,7 @@ function newGenericPool(connectionString, poolOptions) {
 		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
-		log: poolOptions.log || defaults.poolLog,
+		log: poolOptions.log,
 		create: function(cb) {
 			var innerPool = mysql.createPool(connectionString);
 			return cb(null, innerPool);

package/src/mySql/quote.js

@@ -0,0 +1 @@
+module.exports = (name) => `\`${name}\``;

package/src/newImmutable.js

@@ -4,8 +4,7 @@ function newImmutable(fn) {
 	return run;
 
 	function run() {
-		var args = [].slice.call(arguments);
-		return _run(args);
+		return _run([...arguments]);
 	}
 
 	function runFirst(args) {

package/src/oracle/deleteFromSql.js

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

package/src/oracle/formatDateOut.js

@@ -1,4 +1,4 @@
-const quote = require('../table/quote');
+const quote = require('./quote');
 
 function formatDateColumn(column, alias) {
 	return `TO_CHAR(${alias}.${quote(column._dbName)}, 'YYYY-MM-DD"T"HH24:MI:SS.FF3')`;

package/src/oracle/insert.js

@@ -4,17 +4,17 @@ const setSessionSingleton = require('../table/setSessionSingleton');
 const newGetLastInsertedCommand = require('../table/commands/newGetLastInsertedCommand');
 const executeQueries = require('../table/executeQueries');
 
-function insert(table, row, options) {
+function insert(context, table, row, options) {
 
 	return new Promise((res, rej) => {
-		const cmd = newInsertCommand(newInsertCommandCore, table, row, options);
+		const cmd = newInsertCommand(newInsertCommandCore.bind(null, context), table, row, options);
 		cmd.disallowCompress = true;
-		executeQueries([cmd]).then((result) => result[0]).then(onResult).then(res, rej);
+		executeQueries(context, [cmd]).then((result) => result[0]).then(onResult).then(res, rej);
 
 		function onResult([result]) {
-			setSessionSingleton('lastRowid', result.lastRowid);
-			const selectCmd = newGetLastInsertedCommand(table, row, cmd);
-			return executeQueries([selectCmd]).then((result) => res(result[0]));
+			setSessionSingleton(context, 'lastRowid', result.lastRowid);
+			const selectCmd = newGetLastInsertedCommand(context, table, row, cmd);
+			return executeQueries(context, [selectCmd]).then((result) => res(result[0]));
 		}
 
 	});

package/src/oracle/insertSql.js

@@ -1,12 +1,11 @@
-let outputInsertedSql = require('./outputInsertedSql');
 let mergeSql = require('./mergeSql');
-const getSessionSingleton = require('../table/getSessionSingleton');
+const quote = require('./quote');
 
-function getSqlTemplate(_table, _row, options) {
+function getSqlTemplate(_context, _table, _row, options) {
 	if (hasConcurrency(_table, options) && hasColumns())
-		return mergeSql.apply(null, arguments);
+		return mergeSql.apply(null, [...arguments].slice(1));
 	else
-		return insertSql.apply(null, arguments);
+		return insertSql.apply(null, [...arguments].slice(1));
 
 	function hasColumns() {
 		for(let p in _row) {
@@ -27,7 +26,6 @@ function hasConcurrency(table,options) {
 }
 
 function insertSql(table, row) {
-	const quote = getSessionSingleton('quote');
 	let columnNames = [];
 	let regularColumnNames = [];
 	let values = [];
@@ -35,9 +33,9 @@ function insertSql(table, row) {
 	addDiscriminators();
 	addColumns();
 	if (columnNames.length === 0)
-		sql += `${outputInserted()} (${quote(table._primaryColumns[0]._dbName)}) VALUES(DEFAULT)`;
+		sql += ` (${quote(table._primaryColumns[0]._dbName)}) VALUES(DEFAULT)`;
 	else
-		sql = sql + '('+ columnNames.join(',') + ')' + outputInserted() +  'VALUES (' + values.join(',') + ')';
+		sql = sql + '('+ columnNames.join(',') + ')'  +  ' VALUES (' + values.join(',') + ')';
 	return sql;
 
 	function addDiscriminators() {
@@ -65,12 +63,6 @@ function insertSql(table, row) {
 		}
 	}
 
-
-	function outputInserted() {
-
-		return ' ' + outputInsertedSql(table) + ' ';
-	}
-
 }
 
 module.exports = getSqlTemplate;