orange-orm 4.5.0-beta.0 → 4.5.0-beta.2

package/README.md

@@ -359,6 +359,11 @@ npm install pg
 import map from './map';
 const db = map.postgres('postgres://postgres:postgres@postgres/postgres');
 ```
+With schema
+```javascript
+import map from './map';
+const db = map.postgres('postgres://postgres:postgres@postgres/postgres?search_path=custom');
+```
 __Oracle__
 ```bash
 npm install oracledb
@@ -1862,7 +1867,7 @@ Supported functions include:
 - avg  
 
 __On each row__  
-In this example, we are counting the number of lines calculating total amount for each order.  This is represented as the property <i>numberOfLines</i>. You can call these aggregated properties whatever you want.  
+In this example, we are counting the number of lines on each order.  This is represented as the property <i>numberOfLines</i>. You can name these aggregated properties whatever you want.  
 You can also elevate associated data to the a parent level for easier access. In the example below, <i>balance</i> of the customer is elevated to the root level.
 
 ```javascript

package/docs/changelog.md

@@ -1,4 +1,8 @@
 ## Changelog
+__4.4.2__  
+Support for schema in connection string. Postgrs only. [#116](https://github.com/alfateam/orange-orm/issues/118)  
+__4.4.1__  
+Support for date-only ISO strings. [#116](https://github.com/alfateam/orange-orm/issues/116)  
 __4.4.0__  
 More performance gains.  
 __4.3.0__  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.5.0-beta.0",
+  "version": "4.5.0-beta.2",
   "main": "./src/index.js",
   "browser": "./src/client/index.mjs",
   "bin": {
@@ -57,17 +57,16 @@
     "@types/oracledb": "^6.0.4",
     "@types/tedious": "^4.0.14",
     "ajv": "^6.10.2",
+    "assert": "^2.1.0",
     "axios": "^1.6.2",
-    "deferred": "^0.7.5",
     "fast-json-patch": "^3.1.1",
     "findup-sync": "^5.0.0",
     "glob": "^10.3.4",
     "module-definition": "^4.0.0",
     "node-cls": "^1.0.5",
-    "promise": "^8.0.3",
     "rfdc": "^1.2.0",
     "uuid": "^8.3.2",
-    "wrangler": "^3.86.0"
+    "wrangler": "^3.107.2"
   },
   "peerDependencies": {
     "msnodesqlv8": "^4.1.0",
@@ -100,12 +99,16 @@
     },
     "tedious": {
       "optional": true
+    },
+    "oracledb": {
+      "optional": true
     }
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20241106.0",
     "@miniflare/d1": "^2.14.4",
-    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-commonjs": "^28.0.2",
+    "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^13.0.0",
     "@typescript-eslint/eslint-plugin": "^6.x",
     "@typescript-eslint/parser": "^6.x",
@@ -114,6 +117,7 @@
     "eslint": "^8.57.0",
     "eslint-plugin-jest": "^27.1.7",
     "express": "^4.18.2",
+    "miniflare": "^3.20250129.0",
     "msnodesqlv8": "^4.1.0",
     "mysql2": "^3.9.4",
     "oracledb": "^6.3.0",
@@ -124,7 +128,7 @@
     "sqlite3": "^5.0.2",
     "tedious": "^18.2.0",
     "typescript": "^5.4.5",
-    "vitest": "^0.34.1"
+    "vitest": "^0.34.6"
   },
   "engines": {
     "node": ">= 8.0.0"

package/src/applyPatch.js

@@ -1,5 +1,4 @@
 const fastjson = require('fast-json-patch');
-let { inspect } = require('util');
 let assert = require('assert');
 let fromCompareObject = require('./fromCompareObject');
 let toCompareObject = require('./toCompareObject');
@@ -48,7 +47,7 @@ function applyPatch({ options = {} }, dto, changes, column) {
 				catch (e) {
 					if (concurrency === 'skipOnConflict')
 						return false;
-					throw new Error(`The field ${change.path.replace('/', '')} was changed by another user. Expected ${inspect(fromCompareObject(expectedOldValue), false, 10)}, but was ${inspect(fromCompareObject(oldValue), false, 10)}.`);
+					throw new Error(`The field ${change.path.replace('/', '')} was changed by another user. Expected ${inspect(fromCompareObject(expectedOldValue))}, but was ${inspect(fromCompareObject(oldValue))}.`);
 				}
 			}
 			return true;
@@ -102,4 +101,8 @@ function assertDatesEqual(date1, date2) {
 	assert.deepEqual(date1, date2);
 }
 
+function inspect(obj) {
+	return JSON.stringify(obj, null, 2);
+}
+
 module.exports = applyPatch;

package/src/client/index.js

@@ -170,13 +170,14 @@ function rdbClient(options = {}) {
 		if (!db.createTransaction)
 			throw new Error('Transaction not supported through http');
 		const transaction = db.createTransaction(_options);
+
 		try {
 			const nextClient = client({ transaction });
 			await fn(nextClient);
-			await transaction(db.commit);
+			await transaction(transaction.commit);
 		}
 		catch (e) {
-			await transaction(db.rollback.bind(null, e));
+			await transaction(transaction.rollback.bind(null, e));
 		}
 	}