orange-orm 4.1.2 → 4.1.4

package/README.md

@@ -2,7 +2,7 @@
 <img src="./docs/orange.svg" alt="Orange ORM Logo" width="250"/>
 </div>
 
-The ultimate Object Relational Mapper for Node.js and Typescript, offering seamless integration with a variety of popular databases. Whether you're building applications in TypeScript or JavaScript  (including both CommonJS and ECMAScript), Orange ORM has got you covered.  
+The ultimate Object Relational Mapper for Node.js and Typescript, offering seamless integration with a variety of popular databases. Whether you're building applications in TypeScript or JavaScript, including both CommonJS and ECMAScript, Orange ORM has got you covered.  
 
 [![npm version](https://img.shields.io/npm/v/orange-orm.svg?style=flat-square)](https://www.npmjs.org/package/orange-orm)
 [![Build status](https://github.com/alfateam/orange-orm/workflows/Node.js%20CI/badge.svg)](https://github.com/alfateam/orange-orm/actions)
@@ -20,7 +20,7 @@ The ultimate Object Relational Mapper for Node.js and Typescript, offering seaml
 - **Active Record**: With a concise and expressive syntax, Orange enables you to interact with your database using the [*Active Record Pattern*](https://en.wikipedia.org/wiki/Active_record_pattern).
 - **No Code Generation Required**: Enjoy full IntelliSense, even in table mappings, without the need for cumbersome code generation.
 - **TypeScript and JavaScript Support**: Orange fully supports both TypeScript and JavaScript, allowing you to leverage the benefits of static typing and modern ECMAScript features.
-- **Works in the Browser**: You can securely use Orange in the browser by utilizing the Express.js plugin, which serves to safeguard sensitive database credentials from exposure at the client level. This method mirrors a traditional REST API, augmented with advanced TypeScript tooling for enhanced functionality.
+- **Works in the Browser**: You can securely use Orange in the browser by utilizing the Express.js plugin, which serves to safeguard sensitive database credentials from exposure at the client level and protect against SQL injection. This method mirrors a traditional REST API, augmented with advanced TypeScript tooling for enhanced functionality.
 
 ## Supported Databases
 

package/docs/changelog.md

@@ -1,4 +1,8 @@
 ## Changelog
+__4.1.4__  
+Better error message when running over http.  
+__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__  

package/package.json

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

package/src/client/index.mjs

@@ -4842,8 +4842,8 @@ function httpAdapter(baseURL, path, axiosInterceptor) {
 			return res.data;
 		}
 		catch (e) {
-			if (e.response?.data)
-				throw new Error(e.response?.data.replace(/^Error: /, ''));
+			if (typeof e.response?.data === 'string')
+				throw new Error(e.response.data.replace(/^Error: /, ''));
 			else
 				throw e;
 		}
@@ -4857,9 +4857,9 @@ function httpAdapter(baseURL, path, axiosInterceptor) {
 			const res = await axios.request(path, { headers, method: 'patch', data: body });
 			return res.data;
 		}
-		catch (e) {
-			if (e.response?.data)
-				throw new Error(e.response?.data.replace(/^Error: /, ''));
+		catch (e) {			
+			if (typeof e.response?.data === 'string')
+				throw new Error(e.response.data.replace(/^Error: /, ''));
 			else
 				throw e;
 		}
@@ -4874,8 +4874,8 @@ function httpAdapter(baseURL, path, axiosInterceptor) {
 			return res.data;
 		}
 		catch (e) {
-			if (e.response?.data)
-				throw new Error(e.response?.data.replace(/^Error: /, ''));
+			if (typeof e.response?.data === 'string')
+				throw new Error(e.response.data.replace(/^Error: /, ''));
 			else throw e;
 		}
 	}

package/src/client/netAdapter.js

@@ -22,8 +22,8 @@ function httpAdapter(baseURL, path, axiosInterceptor) {
 			return res.data;
 		}
 		catch (e) {
-			if (e.response?.data)
-				throw new Error(e.response?.data.replace(/^Error: /, ''));
+			if (typeof e.response?.data === 'string')
+				throw new Error(e.response.data.replace(/^Error: /, ''));
 			else
 				throw e;
 		}
@@ -38,8 +38,8 @@ function httpAdapter(baseURL, path, axiosInterceptor) {
 			return res.data;
 		}
 		catch (e) {
-			if (e.response?.data)
-				throw new Error(e.response?.data.replace(/^Error: /, ''));
+			if (typeof e.response?.data === 'string')
+				throw new Error(e.response.data.replace(/^Error: /, ''));
 			else
 				throw e;
 		}
@@ -54,8 +54,8 @@ function httpAdapter(baseURL, path, axiosInterceptor) {
 			return res.data;
 		}
 		catch (e) {
-			if (e.response?.data)
-				throw new Error(e.response?.data.replace(/^Error: /, ''));
+			if (typeof e.response?.data === 'string')
+				throw new Error(e.response.data.replace(/^Error: /, ''));
 			else throw e;
 		}
 	}

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));