orange-orm 3.10.2 → 3.10.4

package/src/getTSDefinition.js

@@ -53,14 +53,17 @@ export interface ${Name}Table {
 	getOne(${name}: ${Name}, fetchingStrategy: ${Name}Strategy): Promise<${Name}Row>;
 	getById(${getIdArgs(table)}): Promise<${Name}Row>;
 	getById(${getIdArgs(table)}, fetchingStrategy: ${Name}Strategy): Promise<${Name}Row>;
+
 	update(${name}s: ${Name}[]): Promise<${Name}Array>;
-	updateChanges(${name}s: ${Name}[], old${name}s: ${Name}[]): Promise<${Name}Array>;
 	update(${name}s: ${Name}[], fetchingStrategy: ${Name}Strategy): Promise<${Name}Array>;
-	updateChanges(${name}s: ${Name}[],old${name}s: ${Name}[], fetchingStrategy: ${Name}Strategy): Promise<${Name}Array>;
 	update(${name}: ${Name}): Promise<${Name}Row>;
-	updateChanges(${name}: ${Name}, old${name}: ${Name}): Promise<${Name}Row>;
 	update(${name}: ${Name}, fetchingStrategy: ${Name}Strategy): Promise<${Name}Row>;
-	updateChanges(${name}: ${Name},${name}: ${Name}, fetchingStrategy: ${Name}Strategy): Promise<${Name}Row>;
+
+	updateChanges(${name}s: ${Name}[], old${name}s: ${Name}[]): Promise<${Name}Array>;
+	updateChanges(${name}s: ${Name}[],old${name}s: ${Name}[], fetchingStrategy: ${Name}Strategy): Promise<${Name}Array>;
+	updateChanges(${name}: ${Name}, old${name}: ${Name}): Promise<${Name}Row>;
+	updateChanges(${name}: ${Name},old${name}: ${Name}, fetchingStrategy: ${Name}Strategy): Promise<${Name}Row>;
+	
 	insert(${name}s: ${Name}[]): Promise<${Name}Array>;
 	insert(${name}s: ${Name}[], fetchingStrategy: ${Name}Strategy): Promise<${Name}Array>;
 	insert(${name}: ${Name}): Promise<${Name}Row>;
@@ -82,11 +85,6 @@ export interface ${Name}Table {
 	${_tableRelations}
 }
 
-export interface ${Name}TableBase {	
-	${_columns}
-	${_tableRelations}
-}
-
 export interface ${Name}ExpressConfig {
 	baseFilter?: RawFilter | ((context: ExpressContext) => RawFilter | Promise<RawFilter>);
     customFilters?: Record<string, (context: ExpressContext,...args: any[]) => RawFilter | Promise<RawFilter>>;
@@ -224,6 +222,12 @@ export interface ${name} {
 	${regularRelations}
 }
 
+export interface ${name}TableBase {	
+	${columns(table)}
+	${tableRelations(table)}
+}
+
+
 export interface ${name}Strategy {
 	${strategyColumns(table)}
 	${strategyRelations}
@@ -350,9 +354,9 @@ function getPrefixTs(isNamespace) {
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { AxiosInterceptorManager, InternalAxiosRequestConfig, AxiosResponse } from 'axios';
-import type { BooleanColumn, JSONColumn, UUIDColumn, DateColumn, NumberColumn, BinaryColumn, StringColumn, Concurrency, Filter, RawFilter, TransactionOptions, Pool, Express, Url, ColumnConcurrency, JsonPatch } from 'rdb';
+import type { BooleanColumn, JSONColumn, UUIDColumn, DateColumn, NumberColumn, BinaryColumn, StringColumn, Concurrency, Filter, RawFilter, TransactionOptions, Pool, Express, Url, ColumnConcurrency, JsonPatch } from 'orange-orm';
 export { RequestHandler } from 'express';
-export { Concurrency, Filter, RawFilter, Config, TransactionOptions, Pool } from 'rdb';
+export { Concurrency, Filter, RawFilter, Config, TransactionOptions, Pool } from 'orange-orm';
 export = r;
 declare function r(config: Config): r.RdbClient;
 `;
@@ -363,7 +367,7 @@ declare function r(config: Config): r.RdbClient;
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import schema from './schema';
 import type { AxiosInterceptorManager, InternalAxiosRequestConfig, AxiosResponse } from 'axios';
-import type { BooleanColumn, JSONColumn, UUIDColumn, DateColumn, NumberColumn, BinaryColumn, StringColumn, Concurrency, Filter, RawFilter, TransactionOptions, Pool, Express, Url, ColumnConcurrency, JsonPatch } from 'rdb';
+import type { BooleanColumn, JSONColumn, UUIDColumn, DateColumn, NumberColumn, BinaryColumn, StringColumn, Concurrency, Filter, RawFilter, TransactionOptions, Pool, Express, Url, ColumnConcurrency, JsonPatch } from 'orange-orm';
 export default schema as RdbClient;`;
 }
 

package/src/mssql/newTransaction.js

@@ -54,6 +54,7 @@ function newResolveTransaction(domain, pool) {
 					caller.visitSqlite();
 				};
 				rdb.aggregateCount = 0;
+				rdb.cache = {};
 				domain.rdb = rdb;
 				onSuccess();
 			} catch (e) {

package/src/mySql/newTransaction.js

@@ -42,6 +42,7 @@ function newResolveTransaction(domain, pool) {
 					caller.visitMySql();
 				};
 				rdb.aggregateCount = 0;
+				rdb.cache = {};
 				domain.rdb = rdb;
 				onSuccess();
 			} catch (e) {

package/src/oracle/newTransaction.js

@@ -47,6 +47,7 @@ function newResolveTransaction(domain, pool) {
 					caller.visitSqlite();
 				};
 				rdb.aggregateCount = 0;
+				rdb.cache = {};
 				domain.rdb = rdb;
 				onSuccess();
 			} catch (e) {

package/src/patchTable.js

@@ -3,13 +3,16 @@ let applyPatch = require('./applyPatch');
 let fromCompareObject = require('./fromCompareObject');
 let validateDeleteConflict = require('./validateDeleteConflict');
 let validateDeleteAllowed = require('./validateDeleteAllowed');
+let clearCache = require('./table/clearCache');
 
 async function patchTable() {
 	// const dryrun = true;
 	//traverse all rows you want to update before updatinng or inserting anything.
 	//this is to avoid page locks in ms sql
 	// await patchTableCore.apply(null, [...arguments, dryrun]);
-	return patchTableCore.apply(null, arguments);
+	const result = await patchTableCore.apply(null, arguments);
+	clearCache();
+	return result;
 }
 
 async function patchTableCore(table, patches, { strategy = undefined, deduceStrategy = false, ...options } = {}, dryrun) {

package/src/pg/newTransaction.js

@@ -46,6 +46,7 @@ function newResolveTransaction(domain, pool) {
 					caller.visitPg();
 				};
 				rdb.aggregateCount = 0;
+				rdb.cache = {};
 				domain.rdb = rdb;
 				onSuccess();
 			} catch (e) {

package/src/sap/newTransaction.js

@@ -53,6 +53,7 @@ function newResolveTransaction(domain, pool) {
 					caller.visitSap();
 				};
 				rdb.aggregateCount = 0;
+				rdb.cache = {};
 				domain.rdb = rdb;
 				onSuccess();
 			} catch (e) {

package/src/sqlite/newTransaction.js

@@ -42,6 +42,7 @@ function newResolveTransaction(domain, pool) {
 					caller.visitSqlite();
 				};
 				rdb.aggregateCount = 0;
+				rdb.cache = {};
 				domain.rdb = rdb;
 				onSuccess();
 			} catch (e) {

package/src/table/clearCache.js

@@ -0,0 +1,7 @@
+var setSessionSingleton = require('./setSessionSingleton');
+
+function clearCache() {
+	setSessionSingleton('cache', {});
+}
+
+module.exports = clearCache;

package/src/table/getSessionCache.js

@@ -0,0 +1,8 @@
+var getSessionSingleton = require('./getSessionSingleton');
+
+function getSessionCache(id) {
+	const cache = getSessionSingleton('cache');
+	return cache[id];
+}
+
+module.exports = getSessionCache;

package/src/table/newRowCache.js

@@ -1,6 +1,6 @@
 let newCache = require('./newCache');
-let getSessionSingleton = require('./getSessionSingleton');
-let setSessionSingleton = require('./setSessionSingleton');
+let getSessionCache = require('./getSessionCache');
+let setSessionCache = require('./setSessionCache');
 
 function newRowCache(table) {
 	let id = Symbol();
@@ -38,11 +38,11 @@ function newRowCache(table) {
 
 
 function getCache(table, id) {
-	let cache = getSessionSingleton(id);
+	let cache = getSessionCache(id);
 	if (cache)
 		return cache;
 	cache = _newRowCache(table);
-	setSessionSingleton(id, cache);
+	setSessionCache(id, cache);
 	return cache;
 }
 

package/src/table/relation/newExpanderCache.js

@@ -1,3 +1,5 @@
+//todo remove ?
+//unused ?
 var newRowCache = require('../newRowCache');
 
 function newExpanderCache(joinRelation) {

package/src/table/relation/newManyCache.js

@@ -4,8 +4,8 @@ var synchronizeRemoved = require('./manyCache/synchronizeRemoved');
 var extractParentKey = require('./manyCache/extractParentKey');
 var newCacheCore = require('./newManyCacheCore');
 var newId = require('../../newId');
-var getSessionSingleton = require('../getSessionSingleton');
-var setSessionSingleton = require('../setSessionSingleton');
+var getSessionCache = require('../getSessionCache');
+var setSessionCache = require('../setSessionCache');
 
 function newManyCache(joinRelation) {
 	var c = {};
@@ -25,10 +25,10 @@ function newManyCache(joinRelation) {
 	};
 
 	c.getInnerCache = function() {
-		var cache = getSessionSingleton(key);
+		var cache = getSessionCache(key);
 		if (!cache) {
 			cache = newCacheCore(joinRelation);
-			setSessionSingleton(key, cache);
+			setSessionCache(key, cache);
 			fillCache();
 			synchronizeAdded(c.tryAdd, joinRelation);
 			synchronizeRemoved(c.tryRemove, joinRelation);

package/src/table/setSessionCache.js

@@ -0,0 +1,8 @@
+var getSessionSingleton = require('./getSessionSingleton');
+
+function setSessionCache(id, value) {
+	const cache = getSessionSingleton('cache');
+	cache[id] = value;
+}
+
+module.exports = setSessionCache;

package/src/tedious/newTransaction.js

@@ -57,6 +57,7 @@ function newResolveTransaction(domain, pool) {
 					caller.visitSqlite();
 				};
 				rdb.aggregateCount = 0;
+				rdb.cache = {};
 				domain.rdb = rdb;
 				onSuccess();
 			} catch (e) {