orange-orm 3.10.2

package/src/sap/encodeBuffer.js

@@ -0,0 +1,7 @@
+//unused because using sql parameters instead
+//Remove ?
+function encodeBuffer(buffer) {
+	return 'E\'\\\\x' + buffer.toString('hex') + '\'';
+}
+
+module.exports = encodeBuffer;

package/src/sap/formatDateOut.js

@@ -0,0 +1,5 @@
+function formatDateOut(column, alias) {
+	return `CONVERT(VARCHAR, ${alias}.${column._dbName}, 23)`;
+}
+
+module.exports = formatDateOut;

package/src/sap/insert.js

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

package/src/sap/insertSql.js

@@ -0,0 +1,64 @@
+const mergeSql = require('./mergeSql');
+
+function getSqlTemplate(_table, _row, options) {
+
+	if (hasConcurrency(_table, options) && hasColumns())
+		return mergeSql.apply(null, arguments);
+	else
+		return insertSql.apply(null, arguments);
+
+	function hasColumns() {
+		for(let p in _row) {
+			let alias = _table[p]?.alias;
+			if (alias &&  _row['__' + alias] !== undefined && _table[p]?.equal)
+				return true;
+		}
+	}
+}
+
+function hasConcurrency(table,options) {
+	for (let i = 0; i < table._primaryColumns.length; i++) {
+		const concurrency = options[table._primaryColumns[i]]?.concurrency;
+		if ( concurrency === 'skipOnConflict' || concurrency === 'overwrite' )
+			return true;
+	}
+	return options.concurrency === 'skipOnConflict' || options.concurrency === 'overwrite';
+}
+
+function insertSql(table, row) {
+	let columnNames = [];
+	let regularColumnNames = [];
+	let values = [];
+	let sql = 'INSERT INTO ' + table._dbName + ' ';
+	addDiscriminators();
+	addColumns();
+	if (columnNames.length === 0)
+		sql += ' VALUES()';
+	else
+		sql = sql + '('+ columnNames.join(',') + ')' + ' VALUES (' + values.join(',') + ')';
+	return sql;
+
+	function addDiscriminators() {
+		let discriminators = table._columnDiscriminators;
+		for (let i = 0; i < discriminators.length; i++) {
+			let parts = discriminators[i].split('=');
+			columnNames.push(parts[0]);
+			values.push(parts[1]);
+		}
+	}
+
+	function addColumns() {
+		let columns = table._columns;
+		for (let i = 0; i < columns.length; i++) {
+			let column = columns[i];
+			regularColumnNames.push(column._dbName);
+			if (row['__' + column.alias] !== undefined) {
+				columnNames.push(column._dbName);
+				values.push('%s');
+			}
+		}
+	}
+
+}
+
+module.exports = getSqlTemplate;

package/src/sap/lastInsertedSql.js

@@ -0,0 +1,12 @@
+function lastInsertedSql(table, keyValues) {
+	return keyValues.map((value,i) => {
+		let column = table._primaryColumns[i];
+		if (value === undefined && column.tsType === 'NumberColumn')
+			return `${column._dbName}=@@identity`;
+		else
+			return column.eq(value);
+	});
+
+}
+
+module.exports = lastInsertedSql;

package/src/sap/limitAndOffset.js

@@ -0,0 +1,16 @@
+function limitAndOffset(span) {
+	if (span.offset)
+		return ` ROWS ${limit()} OFFSET ${span.offset}`;
+	else
+		return '';
+
+	function limit() {
+		if (span.limit || span.limit === 0)
+			return ` LIMIT ${span.limit}`;
+		else
+			return '';
+	}
+
+}
+
+module.exports = limitAndOffset;

package/src/sap/mergeSql.js

@@ -0,0 +1,73 @@
+function insertSql(table, row, options) {
+	let columnNames = [];
+	let regularColumnNames = [];
+	let conflictColumnUpdateSql = '';
+	let values = [];
+	addDiscriminators();
+	addColumns();
+
+	const matched = whenMatched();
+	let sql;
+	if (matched)
+		sql = `MERGE INTO ${table._dbName} AS target USING (SELECT ${values.join(',')}) AS source ON ${join()} WHEN MATCHED THEN ${matched} WHEN NOT MATCHED THEN ${whenNotMatched()};`;
+	else
+		sql = `MERGE INTO ${table._dbName} AS target USING (SELECT ${values.join(',')}) AS source ON ${join()} WHEN NOT MATCHED THEN ${whenNotMatched()};`;
+
+	return sql;
+
+	function join() {
+		const discriminators = table._columnDiscriminators.map(x => {
+			const name = x.split('=')[0];
+
+			return `target.${name}=source.${name}`;
+		});
+		const primaries = table._primaryColumns.map(x => `target.${x._dbName}=source.${x._dbName}`);
+		return [...discriminators, ...primaries].join(' AND ');
+	}
+
+	function whenMatched() {
+		if (options.concurrency === 'skipOnConflict' || options.concurrency === 'overwrite') {
+			return conflictColumnUpdateSql;
+		}
+		else return '';
+	}
+
+	function whenNotMatched() {
+		return `INSERT (${columnNames.join(',')}) VALUES (${columnNames.map(name => 'source.' + name)})`;
+	}
+
+	function addDiscriminators() {
+		let discriminators = table._columnDiscriminators;
+		for (let i = 0; i < discriminators.length; i++) {
+			let parts = discriminators[i].split('=');
+			columnNames.push(parts[0]);
+			values.push(`${parts[1]} AS ${parts[0]}`);
+		}
+	}
+
+	function addColumns() {
+		let conflictColumnUpdates = [];
+		let columns = table._columns;
+		for (let i = 0; i < columns.length; i++) {
+			let column = columns[i];
+			regularColumnNames.push(column._dbName);
+			if (row['__' + column.alias] !== undefined) {
+				columnNames.push(column._dbName);
+				values.push(`%s AS ${column.alias}`);
+				addConflictUpdate(column);
+			}
+		}
+		if (conflictColumnUpdates.length > 0)
+			conflictColumnUpdateSql = 'UPDATE SET ' + conflictColumnUpdates.join(',');
+
+		function addConflictUpdate(column) {
+			let concurrency = options[column.alias]?.concurrency || options.concurrency;
+			if (concurrency === 'overwrite')
+				conflictColumnUpdates.push(`target.${column._dbName}=source.${column._dbName}`);
+			else if (concurrency === 'optimistic')
+				conflictColumnUpdates.push(`target.${column._dbName} = CASE WHEN target.${column._dbName} <> source.${column._dbName} THEN CAST('12345678-1234-1234-1234-123456789012Conflict when updating ${column._dbName}12345678-1234-1234-1234-123456789012' AS INTEGER) ELSE target.${column._dbName} END`);
+		}
+	}
+}
+
+module.exports = insertSql;

package/src/sap/newDatabase.js

@@ -0,0 +1,129 @@
+let createDomain = require('../createDomain');
+let newTransaction = require('./newTransaction');
+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');
+let releaseDbClient = require('../table/releaseDbClient');
+let setSessionSingleton = require('../table/setSessionSingleton');
+
+function newDatabase(connectionString, poolOptions) {
+	if (!connectionString)
+		throw new Error('Connection string cannot be empty');
+	var pool;
+	if (!poolOptions)
+		pool = newPool.bind(null,connectionString, poolOptions);
+	else
+		pool = newPool(connectionString, poolOptions);
+
+	let c = {poolFactory: pool, hostLocal, express};
+
+	c.transaction = function(options, fn) {
+		if ((arguments.length === 1) && (typeof options === 'function')) {
+			fn = options;
+			options = undefined;
+		}
+		let domain = createDomain();
+
+		if (fn)
+			return domain.run(runInTransaction);
+		else if ((major >= 12) && useHook()) {
+			domain.exitContext = true;
+			return domain.start().then(run);
+		}
+		else
+			return domain.run(run);
+
+		async function runInTransaction() {
+			let result;
+			let transaction = newTransaction(domain, pool);
+			await new Promise(transaction)
+				.then(begin)
+				.then(fn)
+				.then((res) => result = res)
+				.then(c.commit)
+				.then(null, c.rollback);
+			return result;
+		}
+
+		function run() {
+			let p;
+			let transaction = newTransaction(domain, pool);
+			if (useHook())
+				p = new Promise(transaction);
+			else
+				p = new promise(transaction);
+
+			return p.then(begin);
+		}
+
+	};
+
+	c.createTransaction = function() {
+		let domain = createDomain();
+		let transaction = newTransaction(domain, pool);
+		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));
+		}
+		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)));
+		return p;
+
+		function onResult(result) {
+			releaseDbClient();
+			return result;
+		}
+
+		function onError(e) {
+			releaseDbClient();
+			throw e;
+		}
+	};
+
+
+
+	c.rollback = rollback;
+	c.commit = commit;
+
+	c.end = function() {
+		if (poolOptions)
+			return pool.end();
+		else
+			return Promise.resolve();
+	};
+
+	c.accept = function(caller) {
+		caller.visitSap();
+	};
+
+	return c;
+}
+
+module.exports = newDatabase;

package/src/sap/newPool.js

@@ -0,0 +1,19 @@
+var pools = require('../pools');
+var promise = require('../table/promise');
+var end = require('./pool/end');
+var newGenericPool = require('../mssql/pool/newGenericPool');
+var newId = require('../newId');
+
+function newPool(connectionString, poolOptions) {
+	var pool = newGenericPool(connectionString, poolOptions);
+	var id = newId();
+	var boundEnd = end.bind(null, pool, id);
+	var c = {};
+
+	c.connect = pool.connect;
+	c.end = promise.denodeify(boundEnd);
+	pools[id] = c;
+	return c;
+}
+
+module.exports = newPool;

package/src/sap/newTransaction.js

@@ -0,0 +1,69 @@
+const wrapQuery = require('../mssql/wrapQuery');
+const encodeBoolean = require('./encodeBoolean');
+const deleteFromSql = require('./deleteFromSql');
+const selectForUpdateSql = require('./selectForUpdateSql');
+const lastInsertedSql = require('./lastInsertedSql');
+const formatDateOut = require('./formatDateOut');
+const insertSql = require('./insertSql');
+const insert = require('./insert');
+const limitAndOffset = require('./limitAndOffset');
+
+function newResolveTransaction(domain, pool) {
+	var rdb = {poolFactory: pool};
+	if (!pool.connect) {
+		pool = pool();
+		rdb.pool = pool;
+	}
+
+	return function(onSuccess, onError) {
+		pool.connect(onConnected);
+
+		function onConnected(err, client, done) {
+			try {
+				if (err) {
+					onError(err);
+					return;
+				}
+				client.executeQuery = wrapQuery(client);
+				rdb.engine = 'sap';
+				rdb.dbClient = client;
+				rdb.dbClientDone = done;
+				rdb.encodeBoolean = encodeBoolean;
+				rdb.decodeJSON = decodeJSON;
+				rdb.encodeJSON = JSON.stringify;
+				rdb.deleteFromSql = deleteFromSql;
+				rdb.selectForUpdateSql = selectForUpdateSql;
+				rdb.formatDateOut = formatDateOut;
+				rdb.lastInsertedSql = lastInsertedSql;
+				rdb.insertSql = insertSql;
+				rdb.insert = insert;
+				rdb.lastInsertedIsSeparate = true;
+				rdb.multipleStatements = false;
+				rdb.begin = 'BEGIN TRANSACTION';
+				rdb.limit = (span) => {
+					if (span.offset)
+						return '';
+					else if (span.limit || span.limit === 0)
+						return 'TOP ' + span.limit;
+					else
+						return '';
+				};
+				rdb.limitAndOffset = limitAndOffset;
+				rdb.accept = function(caller) {
+					caller.visitSap();
+				};
+				rdb.aggregateCount = 0;
+				domain.rdb = rdb;
+				onSuccess();
+			} catch (e) {
+				onError(e);
+			}
+		}
+	};
+}
+
+function decodeJSON(value) {
+	return JSON.parse(value);
+}
+
+module.exports = newResolveTransaction;

package/src/sap/pool/end.js

@@ -0,0 +1,13 @@
+var pools = require('../../pools');
+
+function endPool(genericPool, id, done) {
+	genericPool.drain(onDrained);
+
+	function onDrained() {
+		genericPool.destroyAllNow();
+		delete pools[id];
+		done();
+	}
+}
+
+module.exports = endPool;

package/src/sap/selectForUpdateSql.js

@@ -0,0 +1,3 @@
+module.exports = function(alias) {
+	return ' FOR UPDATE OF ' + alias;
+};

package/src/sqlite/deleteFromSql.js

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

package/src/sqlite/encodeBoolean.js

@@ -0,0 +1,7 @@
+function encodeBoolean(bool) {
+	if (bool)
+		return 1;
+	return 0;
+}
+
+module.exports = encodeBoolean;

package/src/sqlite/encodeBuffer.js

@@ -0,0 +1,7 @@
+//unused because using sql parameters instead
+//Remove ?
+function encodeBuffer(buffer) {
+	return 'E\'\\\\x' + buffer.toString('hex') + '\'';
+}
+
+module.exports = encodeBuffer;

package/src/sqlite/insert.js

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

package/src/sqlite/insertSql.js

@@ -0,0 +1,64 @@
+function insertSql(table, row, options) {
+	let columnNames = [];
+	let regularColumnNames = [];
+	let conflictColumnUpdateSql = '';
+	let values = [];
+
+	let sql = 'INSERT INTO ' + table._dbName + ' ';
+	addDiscriminators();
+	addColumns();
+
+	if (columnNames.length === 0) {
+		sql += 'DEFAULT VALUES';
+	} else {
+		sql = sql + '(' + columnNames.join(',') + ') ' + 'VALUES (' + values.join(',') + ')' + onConflict();
+	}
+
+	return sql;
+
+	function onConflict() {
+		if (options.concurrency === 'skipOnConflict' || options.concurrency === 'overwrite') {
+			const primaryKeys = table._primaryColumns.map(x => x._dbName).join(',');
+			return ` ON CONFLICT(${primaryKeys}) ${conflictColumnUpdateSql}`;
+		} else {
+			return '';
+		}
+	}
+
+	function addDiscriminators() {
+		let discriminators = table._columnDiscriminators;
+		for (let i = 0; i < discriminators.length; i++) {
+			let parts = discriminators[i].split('=');
+			columnNames.push(parts[0]);
+			values.push(parts[1]);
+		}
+	}
+
+	function addColumns() {
+		let conflictColumnUpdates = [];
+		let columns = table._columns;
+		for (let i = 0; i < columns.length; i++) {
+			let column = columns[i];
+			regularColumnNames.push(column._dbName);
+			if (row['__' + column.alias] !== undefined) {
+				columnNames.push(column._dbName);
+				values.push('%s');
+				addConflictUpdate(column);
+			}
+		}
+		if (conflictColumnUpdates.length === 0)
+			conflictColumnUpdateSql =  'DO NOTHING';
+		else
+			conflictColumnUpdateSql = 'DO UPDATE SET ' + conflictColumnUpdates.join(',');
+
+		function addConflictUpdate(column) {
+			let concurrency = options[column.alias]?.concurrency || options.concurrency;
+			if (concurrency === 'overwrite') {
+				conflictColumnUpdates.push(`${column._dbName}=excluded.${column._dbName}`);
+			} else if (concurrency === 'optimistic')
+				conflictColumnUpdates.push(`${column._dbName} = CASE WHEN ${table._dbName}.${column._dbName} <> excluded.${column._dbName} THEN '12345678-1234-1234-1234-123456789012Conflict when updating ${column._dbName}12345678-1234-1234-1234-123456789012' ELSE ${table._dbName}.${column._dbName} END`);
+		}
+	}
+}
+
+module.exports = insertSql;

package/src/sqlite/lastInsertedSql.js

@@ -0,0 +1,12 @@
+function lastInsertedSql(table, keyValues) {
+	return keyValues.map((value,i) => {
+		let column = table._primaryColumns[i];
+		if (value === undefined && column.tsType === 'NumberColumn')
+			return 'rowid IN (select last_insert_rowid())';
+		else
+			return column.eq(value);
+	});
+
+}
+
+module.exports = lastInsertedSql;

package/src/sqlite/limitAndOffset.js

@@ -0,0 +1,18 @@
+function limitAndOffset(span) {
+	if (span.offset)
+		return ` limit ${limit()} offset ${span.offset}`;
+	else if (span.limit || span.limit === 0)
+		return ` limit ${span.limit}`;
+	else
+		return '';
+
+	function limit() {
+		if (span.limit || span.limit === 0)
+			return span.limit;
+		else
+			return '-1';
+	}
+
+}
+
+module.exports = limitAndOffset;