orange-orm 4.4.2 → 4.5.0-beta.1

package/src/tedious/newPool.js

@@ -1,17 +1,17 @@
-var pools = require('../pools');
-var promise = require('../table/promise');
-var end = require('./pool/end');
-var newGenericPool = require('./pool/newGenericPool');
-var newId = require('../newId');
+const promisify = require('node:util').promisify;
+const pools = require('../pools');
+const end = require('./pool/end');
+const newGenericPool = require('./pool/newGenericPool');
+const newId = require('../newId');
 
 function newPool(connectionString, poolOptions) {
-	var pool = newGenericPool(connectionString, poolOptions);
-	var id = newId();
-	var boundEnd = end.bind(null, pool, id);
-	var c = {};
+	let pool = newGenericPool(connectionString, poolOptions);
+	let id = newId();
+	let boundEnd = end.bind(null, pool, id);
+	let c = {};
 
 	c.connect = pool.connect;
-	c.end = promise.denodeify(boundEnd);
+	c.end = promisify(boundEnd);
 	pools[id] = c;
 	return c;
 }

package/src/tedious/newTransaction.js

@@ -2,15 +2,15 @@ var wrapQuery = require('./wrapQuery');
 var encodeBoolean = require('./encodeBoolean');
 var deleteFromSql = require('./deleteFromSql');
 var selectForUpdateSql = require('./selectForUpdateSql');
-var outputInsertedSql = require('./outputInsertedSql');
 const limitAndOffset = require('./limitAndOffset');
+const insertSql = require('./insertSql');
 const getManyDto = require('./getManyDto');
 const formatDateOut = require('./formatDateOut');
 const formatJSONOut = require('./formatJSONOut');
-const insertSql = require('./insertSql');
 const insert = require('./insert');
+const quote = require('./quote');
 
-function newResolveTransaction(domain, pool, { readonly } = {}) {
+function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	var rdb = {poolFactory: pool};
 	if (!pool.connect) {
 		pool = pool();
@@ -23,7 +23,6 @@ function newResolveTransaction(domain, pool, { readonly } = {}) {
 	rdb.encodeJSON = JSON.stringify;
 	rdb.deleteFromSql = deleteFromSql;
 	rdb.selectForUpdateSql = selectForUpdateSql;
-	rdb.outputInsertedSql = outputInsertedSql;
 	rdb.lastInsertedIsSeparate = false;
 	rdb.insertSql = insertSql;
 	rdb.insert = insert;
@@ -44,7 +43,7 @@ function newResolveTransaction(domain, pool, { readonly } = {}) {
 		caller.visitSqlite();
 	};
 	rdb.aggregateCount = 0;
-	rdb.quote = (name) => `[${name}]`;
+	rdb.quote = quote;
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/tedious/pool/newGenericPool.js

@@ -2,7 +2,7 @@
 /* eslint-disable no-prototype-builtins */
 var EventEmitter = require('events').EventEmitter;
 
-var defaults = require('./defaults');
+var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
 var tedious = require('tedious');
 var parseConnectionString = require('./parseConnectionString');

package/src/tedious/quote.js

@@ -0,0 +1 @@
+module.exports = (name) => `[${name}]`;

package/src/mssql/pool/defaults.js

@@ -1,45 +0,0 @@
-module.exports = {
-	// database host defaults to localhost
-	host: 'localhost',
-
-	//database user's name
-	user: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//name of database to connect
-	database: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//database user's password
-	password: null,
-
-	//database port
-	port: 5432,
-
-	//number of rows to return at a time from a prepared statement's
-	//portal. 0 will return all rows at once
-	rows: 0,
-
-	// binary result mode
-	binary: false,
-
-	//Connection pool options - see https://github.com/coopernurse/node-pool
-	//number of connections to use in connection pool
-	//0 will disable connection pooling
-	poolSize: 0,
-
-	//max milliseconds a client can go unused before it is removed
-	//from the pool and destroyed
-	poolIdleTimeout: 30000,
-
-	//frequeny to check for idle clients within the client pool
-	reapIntervalMillis: 1000,
-
-	//pool log function / boolean
-	poolLog: false,
-
-	client_encoding: '',
-
-	ssl: false,
-
-	application_name : undefined,
-	fallback_application_name: undefined
-};

package/src/oracle/pool/defaults.js

@@ -1,45 +0,0 @@
-module.exports = {
-	// database host defaults to localhost
-	host: 'localhost',
-
-	//database user's name
-	user: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//name of database to connect
-	database: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//database user's password
-	password: null,
-
-	//database port
-	port: 5432,
-
-	//number of rows to return at a time from a prepared statement's
-	//portal. 0 will return all rows at once
-	rows: 0,
-
-	// binary result mode
-	binary: false,
-
-	//Connection pool options - see https://github.com/coopernurse/node-pool
-	//number of connections to use in connection pool
-	//0 will disable connection pooling
-	poolSize: 0,
-
-	//max milliseconds a client can go unused before it is removed
-	//from the pool and destroyed
-	poolIdleTimeout: 30000,
-
-	//frequeny to check for idle clients within the client pool
-	reapIntervalMillis: 1000,
-
-	//pool log function / boolean
-	poolLog: false,
-
-	client_encoding: '',
-
-	ssl: false,
-
-	application_name : undefined,
-	fallback_application_name: undefined
-};

package/src/pg/pool/defaults.js

@@ -1,45 +0,0 @@
-module.exports = {
-	// database host defaults to localhost
-	host: 'localhost',
-
-	//database user's name
-	user: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//name of database to connect
-	database: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//database user's password
-	password: null,
-
-	//database port
-	port: 5432,
-
-	//number of rows to return at a time from a prepared statement's
-	//portal. 0 will return all rows at once
-	rows: 0,
-
-	// binary result mode
-	binary: false,
-
-	//Connection pool options - see https://github.com/coopernurse/node-pool
-	//number of connections to use in connection pool
-	//0 will disable connection pooling
-	poolSize: 0,
-
-	//max milliseconds a client can go unused before it is removed
-	//from the pool and destroyed
-	poolIdleTimeout: 30000,
-
-	//frequeny to check for idle clients within the client pool
-	reapIntervalMillis: 1000,
-
-	//pool log function / boolean
-	poolLog: false,
-
-	client_encoding: '',
-
-	ssl: false,
-
-	application_name : undefined,
-	fallback_application_name: undefined
-};

package/src/sqlite/pool/defaults.js

@@ -1,45 +0,0 @@
-module.exports = {
-	// database host defaults to localhost
-	host: 'localhost',
-
-	//database user's name
-	user: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//name of database to connect
-	database: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//database user's password
-	password: null,
-
-	//database port
-	port: 5432,
-
-	//number of rows to return at a time from a prepared statement's
-	//portal. 0 will return all rows at once
-	rows: 0,
-
-	// binary result mode
-	binary: false,
-
-	//Connection pool options - see https://github.com/coopernurse/node-pool
-	//number of connections to use in connection pool
-	//0 will disable connection pooling
-	poolSize: 0,
-
-	//max milliseconds a client can go unused before it is removed
-	//from the pool and destroyed
-	poolIdleTimeout: 30000,
-
-	//frequeny to check for idle clients within the client pool
-	reapIntervalMillis: 1000,
-
-	//pool log function / boolean
-	poolLog: false,
-
-	client_encoding: '',
-
-	ssl: false,
-
-	application_name : undefined,
-	fallback_application_name: undefined
-};

package/src/tedious/pool/defaults.js

@@ -1,45 +0,0 @@
-module.exports = {
-	// database host defaults to localhost
-	host: 'localhost',
-
-	//database user's name
-	user: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//name of database to connect
-	database: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//database user's password
-	password: null,
-
-	//database port
-	port: 5432,
-
-	//number of rows to return at a time from a prepared statement's
-	//portal. 0 will return all rows at once
-	rows: 0,
-
-	// binary result mode
-	binary: false,
-
-	//Connection pool options - see https://github.com/coopernurse/node-pool
-	//number of connections to use in connection pool
-	//0 will disable connection pooling
-	poolSize: 0,
-
-	//max milliseconds a client can go unused before it is removed
-	//from the pool and destroyed
-	poolIdleTimeout: 30000,
-
-	//frequeny to check for idle clients within the client pool
-	reapIntervalMillis: 1000,
-
-	//pool log function / boolean
-	poolLog: false,
-
-	client_encoding: '',
-
-	ssl: false,
-
-	application_name : undefined,
-	fallback_application_name: undefined
-};