orange-orm 4.1.1 → 4.1.3

package/docs/changelog.md

@@ -1,4 +1,8 @@
 ## Changelog
+__4.1.3__  
+Do not use transaction in readonly operations. [#109](https://github.com/alfateam/orange-orm/issues/109)  
+__4.1.2__  
+Bugfix with composite primary key with hasMany relation. [#106](https://github.com/alfateam/orange-orm/issues/106)  
 __4.1.1__  
 Some fixes regarding NotNull mappings. [#104](https://github.com/alfateam/orange-orm/issues/91)    
 __4.1.0__  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.1.1",
+  "version": "4.1.3",
   "main": "./src/index.js",
   "browser": "./src/client/index.mjs",
   "bin": {

package/src/getManyDto.js

@@ -1,9 +1,8 @@
+const emptyFilter = require('./emptyFilter');
 const newQuery = require('./getManyDto/newQuery');
 const negotiateRawSqlFilter = require('./table/column/negotiateRawSqlFilter');
 const strategyToSpan = require('./table/strategyToSpan');
 const executeQueries = require('./table/executeQueries');
-const newPrimaryKeyFilter = require('./table/newPrimaryKeyFilter');
-const newForeignKeyFilter = require('./table/relation/newForeignKeyFilter');
 
 async function getManyDto(table, filter, strategy, spanFromParent) {
 	filter = negotiateRawSqlFilter(filter, table);
@@ -151,7 +150,7 @@ async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys
 	function createGetIds() {
 		const primaryColumns = table._primaryColumns;
 		const length = primaryColumns.length;
-		if (length > 1) {
+		if (length === 1) {
 			const alias = table._primaryColumns[0].alias;
 			return (row) => row[alias];
 		}
@@ -186,7 +185,7 @@ async function decodeRelations(strategy, span, rawRows, resultRows, keys) {
 		const name = leg.name;
 		const table = span.table;
 		const relation = table._relations[name];
-		const filter = createOneFilter(relation, span._ids, resultRows, table);
+		const filter = createOneFilter(relation, span._ids);
 		const rowsMap = span._rowsMap;
 		const p = getManyDto(relation.childTable, filter, strategy[name], leg.span).then(subRows => {
 			for (let i = 0; i < subRows.length; i++) {
@@ -207,21 +206,26 @@ async function decodeRelations(strategy, span, rawRows, resultRows, keys) {
 	await Promise.all(promises);
 }
 
-function createOneFilter(relation, ids, parentRows, table) {
-	let parentTable = relation.joinRelation.childTable;
+function createOneFilter(relation, ids) {
+	const columns = relation.joinRelation.columns;
 
-	if (parentTable._primaryColumns.length === 1)
-		return relation.joinRelation.columns[0].in(ids);
+	if (columns.length === 1)
+		return columns[0].in(ids);
 
 	else
 		return createCompositeFilter();
 
 	function createCompositeFilter() {
-		var filter = newPrimaryKeyFilter.apply(null, parentRows[0]);
-
-		for (var i = 1; i < ids.length; i++) {
-			const args = [table].concat(parentRows[i]);
-			filter = filter.or(newForeignKeyFilter.apply(null, args));
+		let filter = emptyFilter;
+		for(let id of ids) {
+			let nextFilter;
+			for (let i = 0; i < columns.length; i++) {
+				if (nextFilter)
+					nextFilter = nextFilter.and(columns[i].eq(id[i]));
+				else
+					nextFilter = columns[i].eq(id[i]);
+			}
+			filter = filter.or(nextFilter);
 		}
 		return filter;
 	}

package/src/hostLocal.js

@@ -3,7 +3,7 @@ let getMeta = require('./hostExpress/getMeta');
 let setSessionSingleton = require('./table/setSessionSingleton');
 let executeQuery = require('./query');
 let hostExpress = require('./hostExpress');
-
+const readonlyOps = ['getManyDto', 'getMany', 'aggregate', 'count'];
 // { db, table, defaultConcurrency,
 // 	concurrency,
 // 	customFilters,
@@ -20,7 +20,7 @@ function hostLocal() {
 		return getMeta(table);
 
 	}
-	async function patch(body,_req, _res) {
+	async function patch(body, _req, _res) {
 		if (!table) {
 			const error = new Error('Table is not exposed');
 			// @ts-ignore
@@ -65,7 +65,10 @@ function hostLocal() {
 				else
 					db = dbPromise;
 			}
-			await db.transaction(fn);
+			if (readonlyOps.includes(body.path))
+				await db.transaction({ readonly: true }, fn);
+			else
+				await db.transaction(fn);
 		}
 		return result;
 
@@ -101,7 +104,7 @@ function hostLocal() {
 	}
 
 	function express(client, options) {
-		return hostExpress(client, options );
+		return hostExpress(client, options);
 	}
 
 	return c;

package/src/mssql/newDatabase.js

@@ -1,6 +1,6 @@
 let createDomain = require('../createDomain');
 let newTransaction = require('./newTransaction');
-let begin = require('../table/begin');
+let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
@@ -19,11 +19,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')) {
@@ -53,6 +53,10 @@ function newDatabase(connectionString, poolOptions) {
 			return result;
 		}
 
+		function begin() {
+			return _begin(options?.readonly);
+		}
+
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool);
@@ -69,7 +73,7 @@ function newDatabase(connectionString, poolOptions) {
 	c.createTransaction = function() {
 		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));

package/src/mySql/newDatabase.js

@@ -1,6 +1,6 @@
 let createDomain = require('../createDomain');
 let newTransaction = require('./newTransaction');
-let begin = require('../table/begin');
+let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
@@ -52,6 +52,10 @@ function newDatabase(connectionString, poolOptions) {
 			return result;
 		}
 
+		function begin() {
+			return _begin(options?.readonly);
+		}
+
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool);
@@ -68,7 +72,7 @@ function newDatabase(connectionString, poolOptions) {
 	c.createTransaction = function() {
 		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));

package/src/oracle/newDatabase.js

@@ -1,6 +1,6 @@
 let createDomain = require('../createDomain');
 let newTransaction = require('./newTransaction');
-let begin = require('../table/begin');
+let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
@@ -19,11 +19,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')) {
@@ -41,6 +41,10 @@ function newDatabase(connectionString, poolOptions) {
 		else
 			return domain.run(run);
 
+		function begin() {
+			return _begin(options?.readonly);
+		}
+
 		async function runInTransaction() {
 			let result;
 			let transaction = newTransaction(domain, pool);
@@ -69,7 +73,7 @@ function newDatabase(connectionString, poolOptions) {
 	c.createTransaction = function() {
 		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));

package/src/pg/newDatabase.js

@@ -1,6 +1,6 @@
 let createDomain = require('../createDomain');
 let newTransaction = require('./newTransaction');
-let begin = require('../table/begin');
+let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
@@ -48,6 +48,8 @@ function newDatabase(connectionString, poolOptions) {
 		else
 			return domain.run(run);
 
+
+
 		async function runInTransaction() {
 			let result;
 			let transaction = newTransaction(domain, pool);
@@ -61,6 +63,10 @@ function newDatabase(connectionString, poolOptions) {
 			return result;
 		}
 
+		function begin() {
+			return _begin(options?.readonly);
+		}
+
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool);
@@ -84,7 +90,7 @@ function newDatabase(connectionString, poolOptions) {
 	c.createTransaction = function(options) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
-		let p = domain.run(() => new Promise(transaction).then(begin).then(negotiateSchema));
+		let p = domain.run(() => new Promise(transaction).then(_begin).then(negotiateSchema));
 
 		function run(fn) {
 			return p.then(domain.run.bind(domain, fn));

package/src/sap/newDatabase.js

@@ -1,6 +1,6 @@
 let createDomain = require('../createDomain');
 let newTransaction = require('./newTransaction');
-let begin = require('../table/begin');
+let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
@@ -41,6 +41,10 @@ function newDatabase(connectionString, poolOptions) {
 		else
 			return domain.run(run);
 
+		function begin() {
+			return _begin(options?.readonly);
+		}
+
 		async function runInTransaction() {
 			let result;
 			let transaction = newTransaction(domain, pool);
@@ -69,7 +73,7 @@ function newDatabase(connectionString, poolOptions) {
 	c.createTransaction = function() {
 		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));

package/src/sqlite/newDatabase.js

@@ -1,6 +1,6 @@
 let createDomain = require('../createDomain');
 let newTransaction = require('./newTransaction');
-let begin = require('../table/begin');
+let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
@@ -41,6 +41,10 @@ function newDatabase(connectionString, poolOptions) {
 		else
 			return domain.run(run);
 
+		function begin() {
+			return _begin(options?.readonly);
+		}
+
 		async function runInTransaction() {
 			let result;
 			let transaction = newTransaction(domain, pool);
@@ -69,7 +73,7 @@ function newDatabase(connectionString, poolOptions) {
 	c.createTransaction = function() {
 		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));

package/src/table/begin.js

@@ -2,8 +2,12 @@ let beginCommand = require('./commands/beginCommand');
 let executeQuery = require('./executeQueries/executeQuery');
 let setSessionSingleton = require('./setSessionSingleton');
 
-function begin() {
+function begin(readonly) {
 	setSessionSingleton('changes', []);
+	if (readonly) {
+		setSessionSingleton('readonly', true);
+		return Promise.resolve();
+	}
 	return executeQuery(beginCommand());
 }
 

package/src/table/commit.js

@@ -3,6 +3,7 @@ let pushCommand = require('./commands/pushCommand');
 let executeChanges = require('./executeQueries/executeChanges');
 let releaseDbClient = require('./releaseDbClient');
 let popChanges = require('./popChanges');
+const getSessionSingleton = require('./getSessionSingleton');
 
 function commit(result) {
 	return popAndPushChanges()
@@ -19,7 +20,8 @@ function commit(result) {
 			await executeChanges(changes);
 			changes = popChanges();
 		}
-		pushCommand(commitCommand);
+		if (!getSessionSingleton('readonly'))
+			pushCommand(commitCommand);
 		return executeChanges(popChanges());
 	}
 }

package/src/tedious/newDatabase.js

@@ -1,6 +1,6 @@
 let createDomain = require('../createDomain');
 let newTransaction = require('./newTransaction');
-let begin = require('../table/begin');
+let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
@@ -19,11 +19,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')) {
@@ -41,6 +41,10 @@ function newDatabase(connectionString, poolOptions) {
 		else
 			return domain.run(run);
 
+		function begin() {
+			return _begin(options?.readonly);
+		}
+
 		async function runInTransaction() {
 			let result;
 			let transaction = newTransaction(domain, pool);
@@ -53,6 +57,7 @@ function newDatabase(connectionString, poolOptions) {
 			return result;
 		}
 
+
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool);
@@ -69,7 +74,7 @@ function newDatabase(connectionString, poolOptions) {
 	c.createTransaction = function() {
 		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));

package/src/tedious/outputInsertedSql.js

@@ -2,7 +2,7 @@ function outputInsertedSql(table) {
 	let separator = '';
 	let result = 'OUTPUT ';
 	for (let i = 0; i < table._columns.length; i++) {
-		result += separator + 'INSERTED.' + table._columns[i]._dbName;
+		result += separator + 'INSERTED.[' + table._columns[i]._dbName + ']';
 		separator = ',';
 	}
 	return result;