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

package/src/pg/pool/newPgPool.js

@@ -4,19 +4,45 @@ var EventEmitter = require('events').EventEmitter;
 
 var defaults = require('./defaults');
 var genericPool = require('../../generic-pool');
-var pg = require('postgres');
+var _pg = require('pg');
 
 function newPgPool(connectionString, poolOptions) {
 	poolOptions = poolOptions || {};
+	let pg = poolOptions.native ? _pg.native : _pg;
 	var pool = genericPool.Pool({
 		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
 		log: poolOptions.log || defaults.poolLog,
 		create: function(cb) {
-			var client = pg(connectionString, {max: 1});
-			client.poolCount = 0;
-			cb(null, client);
+			var client = new pg.Client(connectionString);
+			client.connect(function(err) {
+				if (err) return cb(err, null);
+
+				//handle connected client background errors by emitting event
+				//via the pg object and then removing errored client from the pool
+				client.on('error', function(e) {
+					pool.emit('error', e, client);
+
+					// If the client is already being destroyed, the error
+					// occurred during stream ending. Do not attempt to destroy
+					// the client again.
+					if (!client._destroying) {
+						pool.destroy(client);
+					}
+				});
+
+				// Remove connection from pool on disconnect
+				client.on('end', function(_e) {
+					// Do not enter infinite loop between pool.destroy
+					// and client 'end' event...
+					if (!client._destroying) {
+						pool.destroy(client);
+					}
+				});
+				client.poolCount = 0;
+				return cb(null, client);
+			});
 		},
 		destroy: function(client) {
 			client._destroying = true;

package/src/pg/wrapQuery.js

@@ -2,7 +2,7 @@ var log = require('../table/log');
 var replaceParamChar = require('./replaceParamChar');
 
 function wrapQuery(connection) {
-	// var runOriginalQuery = connection.query;
+	var runOriginalQuery = connection.query;
 	return runQuery;
 
 	function runQuery(query, onCompleted) {
@@ -13,15 +13,18 @@ function wrapQuery(connection) {
 			values: params,
 			types: query.types
 		};
-		log.emitQuery({ sql, parameters: params });
+		log.emitQuery({sql, parameters: params});
 
-		connection.unsafe(sql, params).then(onInnerCompleted, onCompleted);
-		// runOriginalQuery.call(connection, query, onInnerCompleted);
+		runOriginalQuery.call(connection, query, onInnerCompleted);
 
-		function onInnerCompleted(result) {
-			// if (Array.isArray(result))
-			// 	result = result[result.length - 1];
-			onCompleted(null, result);
+		function onInnerCompleted(err, result) {
+			if (err)
+				onCompleted(err);
+			else {
+				if (Array.isArray(result))
+					result = result[result.length-1];
+				onCompleted(null, result.rows);
+			}
 		}
 	}
 

package/src/sap/newDatabase.js

@@ -47,7 +47,7 @@ function newDatabase(connectionString, poolOptions) {
 
 		async function runInTransaction() {
 			let result;
-			let transaction = newTransaction(domain, pool);
+			let transaction = newTransaction(domain, pool, options);
 			await new Promise(transaction)
 				.then(begin)
 				.then(fn)
@@ -59,7 +59,7 @@ function newDatabase(connectionString, poolOptions) {
 
 		function run() {
 			let p;
-			let transaction = newTransaction(domain, pool);
+			let transaction = newTransaction(domain, pool, options);
 			if (useHook())
 				p = new Promise(transaction);
 			else

package/src/sap/newTransaction.js

@@ -8,12 +8,63 @@ const insertSql = require('./insertSql');
 const insert = require('./insert');
 const limitAndOffset = require('./limitAndOffset');
 
-function newResolveTransaction(domain, pool) {
+function newResolveTransaction(domain, pool, { readonly } = {}) {
 	var rdb = {poolFactory: pool};
 	if (!pool.connect) {
 		pool = pool();
 		rdb.pool = pool;
 	}
+	rdb.engine = 'sap';
+	rdb.encodeBoolean = encodeBoolean;
+	rdb.decodeJSON = decodeJSON;
+	rdb.encodeJSON = JSON.stringify;
+	rdb.deleteFromSql = deleteFromSql;
+	rdb.selectForUpdateSql = selectForUpdateSql;
+	rdb.formatDateOut = formatDateOut;
+	rdb.lastInsertedSql = lastInsertedSql;
+	rdb.insertSql = insertSql;
+	rdb.insert = insert;
+	rdb.lastInsertedIsSeparate = true;
+	rdb.multipleStatements = false;
+	rdb.begin = 'BEGIN TRANSACTION';
+	rdb.limit = (span) => {
+		if (span.offset)
+			return '';
+		else if (span.limit || span.limit === 0)
+			return 'TOP ' + span.limit;
+		else
+			return '';
+	};
+	rdb.limitAndOffset = limitAndOffset;
+	rdb.accept = function(caller) {
+		caller.visitSap();
+	};
+	rdb.aggregateCount = 0;
+	rdb.quote = (name) => `[${name}]`;
+
+	if (readonly) {
+		rdb.dbClient = {
+			executeQuery: function(query, callback) {
+				pool.connect((err, client, done) => {
+					if (err) {
+						return callback(err);
+					}
+					try {
+						wrapQuery(client)(query, (err, res) => {
+							done();
+							callback(err, res);
+						});
+					} catch (e) {
+						done();
+						callback(e);
+					}
+				});
+			}
+		};
+		domain.rdb = rdb;
+		return (onSuccess) => onSuccess();
+	}
+
 
 	return function(onSuccess, onError) {
 		pool.connect(onConnected);
@@ -25,35 +76,8 @@ function newResolveTransaction(domain, pool) {
 					return;
 				}
 				client.executeQuery = wrapQuery(client);
-				rdb.engine = 'sap';
 				rdb.dbClient = client;
 				rdb.dbClientDone = done;
-				rdb.encodeBoolean = encodeBoolean;
-				rdb.decodeJSON = decodeJSON;
-				rdb.encodeJSON = JSON.stringify;
-				rdb.deleteFromSql = deleteFromSql;
-				rdb.selectForUpdateSql = selectForUpdateSql;
-				rdb.formatDateOut = formatDateOut;
-				rdb.lastInsertedSql = lastInsertedSql;
-				rdb.insertSql = insertSql;
-				rdb.insert = insert;
-				rdb.lastInsertedIsSeparate = true;
-				rdb.multipleStatements = false;
-				rdb.begin = 'BEGIN TRANSACTION';
-				rdb.limit = (span) => {
-					if (span.offset)
-						return '';
-					else if (span.limit || span.limit === 0)
-						return 'TOP ' + span.limit;
-					else
-						return '';
-				};
-				rdb.limitAndOffset = limitAndOffset;
-				rdb.accept = function(caller) {
-					caller.visitSap();
-				};
-				rdb.aggregateCount = 0;
-				rdb.quote = (name) => `[${name}]`;
 				domain.rdb = rdb;
 				onSuccess();
 			} catch (e) {

package/src/sqlite/newDatabase.js

@@ -47,7 +47,7 @@ function newDatabase(connectionString, poolOptions) {
 
 		async function runInTransaction() {
 			let result;
-			let transaction = newTransaction(domain, pool);
+			let transaction = newTransaction(domain, pool, options);
 			await new Promise(transaction)
 				.then(begin)
 				.then(fn)
@@ -59,7 +59,7 @@ function newDatabase(connectionString, poolOptions) {
 
 		function run() {
 			let p;
-			let transaction = newTransaction(domain, pool);
+			let transaction = newTransaction(domain, pool, options);
 			if (useHook())
 				p = new Promise(transaction);
 			else

package/src/sqlite/newTransaction.js

@@ -7,12 +7,52 @@ const limitAndOffset = require('./limitAndOffset');
 const insertSql = require('./insertSql');
 const insert = require('./insert');
 
-function newResolveTransaction(domain, pool) {
+function newResolveTransaction(domain, pool, { readonly } = {})  {
 	var rdb = {poolFactory: pool};
 	if (!pool.connect) {
 		pool = pool();
 		rdb.pool = pool;
 	}
+	rdb.engine = 'sqlite';
+	rdb.encodeBoolean = encodeBoolean;
+	rdb.decodeJSON = decodeJSON;
+	rdb.encodeJSON = JSON.stringify;
+	rdb.deleteFromSql = deleteFromSql;
+	rdb.selectForUpdateSql = selectForUpdateSql;
+	rdb.lastInsertedSql = lastInsertedSql;
+	rdb.insertSql = insertSql;
+	rdb.insert = insert;
+	rdb.lastInsertedIsSeparate = true;
+	rdb.multipleStatements = false;
+	rdb.limitAndOffset = limitAndOffset;
+	rdb.accept = function(caller) {
+		caller.visitSqlite();
+	};
+	rdb.aggregateCount = 0;
+	rdb.quote = (name) => `"${name}"`;
+
+	if (readonly) {
+		rdb.dbClient = {
+			executeQuery: function(query, callback) {
+				pool.connect((err, client, done) => {
+					if (err) {
+						return callback(err);
+					}
+					try {
+						wrapQuery(client)(query, (err, res) => {
+							done();
+							callback(err, res);
+						});
+					} catch (e) {
+						done();
+						callback(e);
+					}
+				});
+			}
+		};
+		domain.rdb = rdb;
+		return (onSuccess) => onSuccess();
+	}
 
 	return function(onSuccess, onError) {
 		pool.connect(onConnected);
@@ -24,25 +64,8 @@ function newResolveTransaction(domain, pool) {
 					return;
 				}
 				client.executeQuery = wrapQuery(client);
-				rdb.engine = 'sqlite';
 				rdb.dbClient = client;
 				rdb.dbClientDone = done;
-				rdb.encodeBoolean = encodeBoolean;
-				rdb.decodeJSON = decodeJSON;
-				rdb.encodeJSON = JSON.stringify;
-				rdb.deleteFromSql = deleteFromSql;
-				rdb.selectForUpdateSql = selectForUpdateSql;
-				rdb.lastInsertedSql = lastInsertedSql;
-				rdb.insertSql = insertSql;
-				rdb.insert = insert;
-				rdb.lastInsertedIsSeparate = true;
-				rdb.multipleStatements = false;
-				rdb.limitAndOffset = limitAndOffset;
-				rdb.accept = function(caller) {
-					caller.visitSqlite();
-				};
-				rdb.aggregateCount = 0;
-				rdb.quote = (name) => `"${name}"`;
 				domain.rdb = rdb;
 				onSuccess();
 			} catch (e) {

package/src/tedious/newDatabase.js

@@ -47,7 +47,7 @@ function newDatabase(connectionString, poolOptions) {
 
 		async function runInTransaction() {
 			let result;
-			let transaction = newTransaction(domain, pool);
+			let transaction = newTransaction(domain, pool, options);
 			await new Promise(transaction)
 				.then(begin)
 				.then(fn)
@@ -60,7 +60,7 @@ function newDatabase(connectionString, poolOptions) {
 
 		function run() {
 			let p;
-			let transaction = newTransaction(domain, pool);
+			let transaction = newTransaction(domain, pool, options);
 			if (useHook())
 				p = new Promise(transaction);
 			else

package/src/tedious/newTransaction.js

@@ -10,12 +10,64 @@ const formatJSONOut = require('./formatJSONOut');
 const insertSql = require('./insertSql');
 const insert = require('./insert');
 
-function newResolveTransaction(domain, pool) {
+function newResolveTransaction(domain, pool, { readonly } = {}) {
 	var rdb = {poolFactory: pool};
 	if (!pool.connect) {
 		pool = pool();
 		rdb.pool = pool;
 	}
+	rdb.engine = 'mssql';
+	rdb.getManyDto = getManyDto;
+	rdb.encodeBoolean = encodeBoolean;
+	rdb.decodeJSON = decodeJSON;
+	rdb.encodeJSON = JSON.stringify;
+	rdb.deleteFromSql = deleteFromSql;
+	rdb.selectForUpdateSql = selectForUpdateSql;
+	rdb.outputInsertedSql = outputInsertedSql;
+	rdb.lastInsertedIsSeparate = false;
+	rdb.insertSql = insertSql;
+	rdb.insert = insert;
+	rdb.formatDateOut = formatDateOut;
+	rdb.formatJSONOut = formatJSONOut;
+	rdb.multipleStatements = true;
+	rdb.begin = 'BEGIN TRANSACTION';
+	rdb.limit = (span) => {
+		if (span.offset)
+			return '';
+		else if (span.limit || span.limit === 0)
+			return 'TOP ' + span.limit;
+		else
+			return '';
+	};
+	rdb.limitAndOffset = limitAndOffset;
+	rdb.accept = function(caller) {
+		caller.visitSqlite();
+	};
+	rdb.aggregateCount = 0;
+	rdb.quote = (name) => `[${name}]`;
+
+	if (readonly) {
+		rdb.dbClient = {
+			executeQuery: function(query, callback) {
+				pool.connect((err, client, done) => {
+					if (err) {
+						return callback(err);
+					}
+					try {
+						wrapQuery(client)(query, (err, res) => {
+							done();
+							callback(err, res);
+						});
+					} catch (e) {
+						done();
+						callback(e);
+					}
+				});
+			}
+		};
+		domain.rdb = rdb;
+		return (onSuccess) => onSuccess();
+	}
 
 	return function(onSuccess, onError) {
 		pool.connect(onConnected);
@@ -27,37 +79,8 @@ function newResolveTransaction(domain, pool) {
 					return;
 				}
 				client.executeQuery = wrapQuery(client);
-				rdb.engine = 'mssql';
-				rdb.getManyDto = getManyDto;
 				rdb.dbClient = client;
 				rdb.dbClientDone = done;
-				rdb.encodeBoolean = encodeBoolean;
-				rdb.decodeJSON = decodeJSON;
-				rdb.encodeJSON = JSON.stringify;
-				rdb.deleteFromSql = deleteFromSql;
-				rdb.selectForUpdateSql = selectForUpdateSql;
-				rdb.outputInsertedSql = outputInsertedSql;
-				rdb.lastInsertedIsSeparate = false;
-				rdb.insertSql = insertSql;
-				rdb.insert = insert;
-				rdb.formatDateOut = formatDateOut;
-				rdb.formatJSONOut = formatJSONOut;
-				rdb.multipleStatements = true;
-				rdb.begin = 'BEGIN TRANSACTION';
-				rdb.limit = (span) => {
-					if (span.offset)
-						return '';
-					else if (span.limit || span.limit === 0)
-						return 'TOP ' + span.limit;
-					else
-						return '';
-				};
-				rdb.limitAndOffset = limitAndOffset;
-				rdb.accept = function(caller) {
-					caller.visitSqlite();
-				};
-				rdb.aggregateCount = 0;
-				rdb.quote = (name) => `[${name}]`;
 				domain.rdb = rdb;
 				onSuccess();
 			} catch (e) {