orange-orm 4.5.1-beta.3 → 4.5.1

package/src/table/column/binary/newEncode.js

@@ -1,36 +1,26 @@
 var purify = require('./purify');
 var newParam = require('../../query/newParameterized');
-var getSessionSingleton = require('../../getSessionSingleton');
 
 function _new(_column) {
 
-	function encode(context, value) {
+	function encode(_context, value) {
 		value = purify(value);
 		if (value === null)
 			return newParam('null');
-
-		var encodeCore = getSessionSingleton(context, 'encodeBinary') || encodeDefault;
-		const enc = encodeCore(value);
-		return newParam('?', [enc]);
+		return newParam('?', [Buffer.from(value, 'base64')]);
 	}
-	encode.unsafe = function(context, value) {
+	encode.unsafe = function(_context, value) {
 		value = purify(value);
 		if (value === null)
 			return 'null';
-		var encodeCore = getSessionSingleton(context, 'encodeBinary') || encodeDefault;
-		return encodeCore(value);
+		return Buffer.from(value, 'base64');
 	};
 
-	encode.direct = function(context, value) {
-		var encodeCore = getSessionSingleton(context, 'encodeBinary') || encodeDefault;
-		return encodeCore(value);
+	encode.direct = function(_context, value) {
+		return Buffer.from(value, 'base64');
 	};
 
 	return encode;
 }
 
-function encodeDefault(base64) {
-	return Buffer.from(base64, 'base64');
-}
-
 module.exports = _new;

package/src/table/getSessionCache.js

@@ -0,0 +1,8 @@
+const getSessionSingleton = require('./getSessionSingleton');
+
+function getSessionCache(context, id) {
+	const cache = getSessionSingleton(context, '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(context, table, id) {
-	let cache = getSessionSingleton(context, id);
+	let cache = getSessionCache(context, id);
 	if (cache)
 		return cache;
 	cache = _newRowCache(table);
-	setSessionSingleton(context, id, cache);
+	setSessionCache(context, id, cache);
 	return cache;
 }
 

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 = {};
@@ -26,10 +26,10 @@ function newManyCache(joinRelation) {
 
 	c.getInnerCache = function(context) {
 		const theKey = negotiateKey();
-		var cache = getSessionSingleton(context, theKey);
+		var cache = getSessionCache(context, theKey);
 		if (!cache) {
 			cache = newCacheCore(joinRelation);
-			setSessionSingleton(context, theKey, cache);
+			setSessionCache(context, theKey, cache);
 			fillCache(context);
 			synchronizeAdded(context, c.tryAdd.bind(null, context), joinRelation);
 			synchronizeRemoved(context, c.tryRemove.bind(null, context), joinRelation);

package/src/table/resultToRows/newDecodeDbRow.js

@@ -207,7 +207,7 @@ function newDecodeDbRow(table, dbRow, filteredAliases, shouldValidate, isInsert)
 		for (let i = 0; i < numberOfColumns; i++) {
 			let index = offset + i;
 			let key = keys[index];
-			if (row[key] !== undefined && !isInsert)
+			if (row[key] !== undefined)
 				row[key] = columns[i].decode(context, row[key]);
 			if (shouldValidate && columns[i].validate)
 				columns[i].validate(row[key], row, isInsert);

package/src/table/setSessionCache.js

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

package/src/table/setSessionSingleton.js

@@ -1,4 +1,4 @@
-var getSessionContext = require('./getSessionContext');
+const getSessionContext = require('./getSessionContext');
 
 function setSessionSingleton(context, name, value) {
 	const rdb = getSessionContext(context);

package/src/tedious/newTransaction.js

@@ -44,6 +44,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	};
 	rdb.aggregateCount = 0;
 	rdb.quote = quote;
+	rdb.cache = {};
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/tedious/pool/newGenericPool.js

@@ -3,7 +3,7 @@
 
 var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
-var tedious;
+var tedious = require('tedious');
 var parseConnectionString = require('./parseConnectionString');
 
 function newGenericPool(connectionString, poolOptions) {
@@ -17,13 +17,7 @@ function newGenericPool(connectionString, poolOptions) {
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
 		log: poolOptions.log || defaults.poolLog,
-		create: async function(cb) {
-			try {
-				if (!tedious)
-					tedious = await import('tedious');
-			} catch (err) {
-				return cb(err, null);
-			}
+		create: function(cb) {
 			var client = new tedious.Connection(connectionString);
 			client.on('connect', onConnected);
 			client.connect();

package/src/tedious/wrapQuery.js

@@ -1,31 +1,12 @@
 var log = require('../table/log');
+var { Request, TYPES } = require('tedious');
 
 function wrapQuery(connection) {
-	let CachedRequest = null;
-	let CachedTypes = null;
-
 	return runQuery;
 
 	function runQuery(query, onCompleted) {
-		if (!CachedRequest || !CachedTypes) {
-			import('tedious')
-				.then(({ Request, TYPES }) => {
-					CachedRequest = Request;
-					CachedTypes = TYPES;
-					doQuery(query, onCompleted);
-				})
-				.catch(err => onCompleted(extractError(err), []));
-		}
-		else {
-			doQuery(query, onCompleted);
-		}
-	}
-
-	function doQuery(query, onCompleted) {
 		const result = [];
 		const sql = replaceParamChar(query.sql(), query.parameters);
-
-		// Transaction statements
 		if (sql.length < 18 && query.parameters.length === 0) {
 			if (sql === 'BEGIN TRANSACTION') {
 				log.emitQuery({ sql, parameters: [] });
@@ -49,45 +30,38 @@ function wrapQuery(connection) {
 				return;
 			}
 		}
-
 		let keys;
-		// Now we can safely create Request using CachedRequest
-		var request = new CachedRequest(sql, onInnerCompleted);
-		const params = addParameters(request, query.parameters, CachedTypes);
-
+		var request = new Request(sql, onInnerCompleted);
+		const params = addParameters(request, query.parameters);
 		request.on('row', rows => {
 			const tmp = {};
 			if (!keys) {
 				keys = Object.keys(rows);
 			}
-			keys.forEach(cols => {
+			keys.forEach((cols) => {
 				tmp[cols] = rows[cols].value;
 			});
 			result.push(tmp);
 		});
-
 		log.emitQuery({ sql, parameters: params });
 		connection.execSql(request);
 
 		function onInnerCompleted(err) {
 			if (err) {
 				onCompleted(extractError(err));
-			} else {
-				onCompleted(null, result);
 			}
+			else
+				onCompleted(null, result);
 		}
 	}
-}
 
-// same helpers as before
-
-function extractError(e) {
-	if (e && e.errors) {
-		return e.errors[0];
-	}
-	else {
-		return e;
+	function extractError(e) {
+		if (e && e.errors)
+			return e.errors[0];
+		else
+			return e;
 	}
+
 }
 
 function replaceParamChar(sql, params) {
@@ -103,7 +77,7 @@ function replaceParamChar(sql, params) {
 	return sql;
 }
 
-function addParameters(request, params, TYPES) {
+function addParameters(request, params) {
 	const res = [];
 	for (let i = 0; i < params.length; i++) {
 		const p = [`${i}`, toType(params[i]), params[i]];
@@ -119,6 +93,7 @@ function addParameters(request, params, TYPES) {
 			return TYPES.Int;
 		else if (typeof p === 'number')
 			return TYPES.Money;
+		// @ts-ignore
 		else if (p instanceof Date && !isNaN(p))
 			return TYPES.Date;
 		else if (Array.isArray(p))
@@ -129,7 +104,9 @@ function addParameters(request, params, TYPES) {
 			return TYPES.NVarChar;
 		else
 			throw new Error('Unknown data type');
+
 	}
+
 }
 
-module.exports = wrapQuery;
+module.exports = wrapQuery;