orange-orm 4.7.0-beta.2 → 4.7.0

package/README.md

@@ -286,6 +286,10 @@ npm install sqlite3
 ```javascript
 import map from './map';
 const db = map.sqlite('demo.db');
+// … use the database …
+
+// IMPORTANT for serverless functions:
+await db.close();           // closes the client connection
 ```
 __With connection pool__
 ```bash
@@ -294,7 +298,14 @@ npm install sqlite3
 ```javascript
 import map from './map';
 const db = map.sqlite('demo.db', { size: 10 });
+// … use the pool …
+
+// IMPORTANT for serverless functions:
+await pool.close();         // closes all pooled connections
 ```
+__Why close ?__  
+In serverless environments (e.g. AWS Lambda, Vercel, Cloudflare Workers) execution contexts are frequently frozen and resumed. Explicitly closing the client or pool ensures that file handles are released promptly and prevents “database locked” errors between invocations.  
+
 __From the browser__  
 You can securely use Orange from the browser by utilizing the Express plugin, which serves to safeguard sensitive database credentials from exposure at the client level. This technique bypasses the need to transmit raw SQL queries directly from the client to the server. Instead, it logs method calls initiated by the client, which are later replayed and authenticated on the server. This not only reinforces security by preventing the disclosure of raw SQL queries on the client side but also facilitates a smoother operation. Essentially, this method mirrors a traditional REST API, augmented with advanced TypeScript tooling for enhanced functionality. You can read more about it in the section called [In the browser](#user-content-in-the-browser)  
 <sub>📄 server.ts</sub>
@@ -1580,12 +1591,10 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const filter = db.order.lines.any(x => x.product.contains('guitar'));
-  //equivalent syntax:
-  // const filter = db.order.lines.product.contains('guitar');
-
   const rows = await db.order.getAll({
     where: y => y.lines.any(x => x.product.contains('guitar'))
+    //equivalent syntax:
+    //where: x => x.lines.product.contains('guitar')
   });  
 }
 ```

package/dist/index.browser.mjs

@@ -2727,6 +2727,11 @@ function requireClient () {
 		client.http = onProvider.bind(null, 'http');//todo
 		client.mysql = onProvider.bind(null, 'mysql');
 		client.express = express;
+		client.close = close;
+
+		function close() {
+			return client.db.end ? client.db.end() : Promise.resolve();
+		}
 
 		function onProvider(name, ...args) {
 			let db = providers[name].apply(null, args);
@@ -4369,7 +4374,7 @@ function requireEndsWithCore () {
 	var nullOperator = ' is ';
 
 	function endsWithCore(context, operator, column,arg,alias) {
-		alias = quote(alias);
+		alias = quote(context, alias);
 		operator = ' ' + operator + ' ';
 		var encoded = column.encode(context, arg);
 		if (encoded.sql() == 'null')
@@ -6081,7 +6086,7 @@ function requireNegotiateExclusive () {
 	function negotiateExclusive(context, table, alias, _exclusive) {
 		if (table._exclusive || _exclusive) {
 			var encode =  getSessionSingleton(context, 'selectForUpdateSql');
-			return encode(alias);
+			return encode(context, alias);
 		}
 		return '';
 	}
@@ -11076,8 +11081,8 @@ function requireGetManyDto$1 () {
 			return decode(context, strategy[name], leg.span, rawRows, keys, updateParent);
 
 			function updateParent(subRow, i) {
-				resultRows[i][name] = subRow;
-
+				if (resultRows[i])
+					resultRows[i][name] = subRow;
 			}
 		};
 
@@ -12626,8 +12631,8 @@ function requireSelectForUpdateSql$1 () {
 	hasRequiredSelectForUpdateSql$1 = 1;
 	const quote = requireQuote$2();
 
-	selectForUpdateSql$1 = function(alias) {
-		return ' FOR UPDATE OF ' + quote(alias);
+	selectForUpdateSql$1 = function(context, alias) {
+		return ' FOR UPDATE OF ' + quote(context, alias);
 	};
 	return selectForUpdateSql$1;
 }
@@ -13919,6 +13924,7 @@ function requireNewGenericPool () {
 		poolOptions = poolOptions || {};
 		// @ts-ignore
 		var pool = genericPool.Pool({
+			min: poolOptions.min || 0,
 			max: 1,
 			idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 			reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
@@ -14003,11 +14009,8 @@ function requireNewDatabase$1 () {
 	function newDatabase(d1Database, poolOptions) {
 		if (!d1Database)
 			throw new Error('Missing d1Database');
-		var pool;
-		if (!poolOptions)
-			pool = newPool.bind(null,d1Database, poolOptions);
-		else
-			pool = newPool(d1Database, poolOptions);
+		poolOptions = poolOptions || { min: 1 };
+		var pool = newPool(d1Database, poolOptions);
 
 		let c = {poolFactory: pool, hostLocal, express};
 
@@ -14455,10 +14458,8 @@ function requireNewTransaction () {
 
 	function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 		var rdb = { poolFactory: pool };
-		if (!pool.connect) {
+		if (!pool.connect)
 			pool = pool();
-			rdb.pool = pool;
-		}
 
 		rdb.engine = 'pg';
 		rdb.encodeDate = encodeDate;
@@ -14570,6 +14571,7 @@ function requireNewPgPool () {
 
 		//@ts-ignore
 		const pool = genericPool.Pool({
+			min: poolOptions.min || 0,
 			max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 			idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 			reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
@@ -14705,11 +14707,8 @@ function requireNewDatabase () {
 	let setSessionSingleton = requireSetSessionSingleton();
 
 	function newDatabase(connectionString, poolOptions) {
-		var pool;
-		if (!poolOptions)
-			pool = newPool.bind(null, connectionString, poolOptions);
-		else
-			pool = newPool(connectionString, poolOptions);
+		poolOptions = poolOptions || { min: 1 };
+		var pool = newPool(connectionString, poolOptions);
 
 		let c = { poolFactory: pool, hostLocal, express };
 

package/dist/index.mjs

@@ -2729,6 +2729,11 @@ function requireClient () {
 		client.http = onProvider.bind(null, 'http');//todo
 		client.mysql = onProvider.bind(null, 'mysql');
 		client.express = express;
+		client.close = close;
+
+		function close() {
+			return client.db.end ? client.db.end() : Promise.resolve();
+		}
 
 		function onProvider(name, ...args) {
 			let db = providers[name].apply(null, args);
@@ -4371,7 +4376,7 @@ function requireEndsWithCore () {
 	var nullOperator = ' is ';
 
 	function endsWithCore(context, operator, column,arg,alias) {
-		alias = quote(alias);
+		alias = quote(context, alias);
 		operator = ' ' + operator + ' ';
 		var encoded = column.encode(context, arg);
 		if (encoded.sql() == 'null')
@@ -6083,7 +6088,7 @@ function requireNegotiateExclusive () {
 	function negotiateExclusive(context, table, alias, _exclusive) {
 		if (table._exclusive || _exclusive) {
 			var encode =  getSessionSingleton(context, 'selectForUpdateSql');
-			return encode(alias);
+			return encode(context, alias);
 		}
 		return '';
 	}
@@ -11078,8 +11083,8 @@ function requireGetManyDto$2 () {
 			return decode(context, strategy[name], leg.span, rawRows, keys, updateParent);
 
 			function updateParent(subRow, i) {
-				resultRows[i][name] = subRow;
-
+				if (resultRows[i])
+					resultRows[i][name] = subRow;
 			}
 		};
 
@@ -13945,6 +13950,7 @@ function requireNewGenericPool$7 () {
 			connectionString.dateStrings = true;
 		poolOptions = poolOptions || {};
 		var pool = genericPool.Pool({
+			min: poolOptions.min || 0,
 			max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 			idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 			reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
@@ -14047,11 +14053,8 @@ function requireNewDatabase$b () {
 	function newDatabase(connectionString, poolOptions) {
 		if (!connectionString)
 			throw new Error('Connection string cannot be empty');
-		var pool;
-		if (!poolOptions)
-			pool = newPool.bind(null, connectionString, poolOptions);
-		else
-			pool = newPool(connectionString, poolOptions);
+		poolOptions = poolOptions || { min: 1 };
+		var pool = newPool(connectionString, poolOptions);
 
 		let c = { poolFactory: pool, hostLocal, express };
 
@@ -14497,10 +14500,8 @@ function requireNewTransaction$a () {
 
 	function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 		var rdb = { poolFactory: pool };
-		if (!pool.connect) {
+		if (!pool.connect)
 			pool = pool();
-			rdb.pool = pool;
-		}
 
 		rdb.engine = 'pg';
 		rdb.encodeDate = encodeDate;
@@ -14612,6 +14613,7 @@ function requireNewPgPool$2 () {
 
 		//@ts-ignore
 		const pool = genericPool.Pool({
+			min: poolOptions.min || 0,
 			max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 			idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 			reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
@@ -14747,11 +14749,8 @@ function requireNewDatabase$a () {
 	let setSessionSingleton = requireSetSessionSingleton();
 
 	function newDatabase(connectionString, poolOptions) {
-		var pool;
-		if (!poolOptions)
-			pool = newPool.bind(null, connectionString, poolOptions);
-		else
-			pool = newPool(connectionString, poolOptions);
+		poolOptions = poolOptions || { min: 1 };
+		var pool = newPool(connectionString, poolOptions);
 
 		let c = { poolFactory: pool, hostLocal, express };
 
@@ -15156,6 +15155,7 @@ function requireNewPgPool$1 () {
 
 		//@ts-ignore
 		const pool = genericPool.Pool({
+			min: poolOptions.min || 0,
 			max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 			idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 			reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
@@ -15256,11 +15256,8 @@ function requireNewDatabase$9 () {
 	function newDatabase(connectionString, poolOptions) {
 		if (!connectionString)
 			throw new Error('Connection string cannot be empty');
-		var pool;
-		if (!poolOptions)
-			pool = newPool.bind(null, connectionString, poolOptions);
-		else
-			pool = newPool(connectionString, poolOptions);
+		poolOptions = poolOptions || { min: 1 };
+		var pool = newPool(connectionString, poolOptions);
 
 		let c = { poolFactory: pool, hostLocal, express };
 
@@ -15589,6 +15586,7 @@ function requireNewPgPool () {
 
 		// @ts-ignore
 		var pool = genericPool.Pool({
+			min: poolOptions.min || 0,
 			max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 			idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 			reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
@@ -15730,11 +15728,8 @@ function requireNewDatabase$8 () {
 	function newDatabase(connectionString, poolOptions) {
 		if (!connectionString)
 			throw new Error('Connection string cannot be empty');
-		var pool;
-		if (!poolOptions)
-			pool = newPool.bind(null, connectionString, poolOptions);
-		else
-			pool = newPool(connectionString, poolOptions);
+		poolOptions = poolOptions || { min: 1 };
+		var pool = newPool(connectionString, poolOptions);
 
 		let c = { poolFactory: pool, hostLocal, express };
 
@@ -15938,8 +15933,8 @@ function requireSelectForUpdateSql$3 () {
 	hasRequiredSelectForUpdateSql$3 = 1;
 	const quote = requireQuote$6();
 
-	selectForUpdateSql$3 = function(alias) {
-		return ' FOR UPDATE OF ' + quote(alias);
+	selectForUpdateSql$3 = function(context, alias) {
+		return ' FOR UPDATE OF ' + quote(context, alias);
 	};
 	return selectForUpdateSql$3;
 }
@@ -16234,6 +16229,7 @@ function requireNewGenericPool$6 () {
 
 		poolOptions = poolOptions || {};
 		var pool = genericPool.Pool({
+			min: poolOptions.min || 0,
 			max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 			idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 			reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
@@ -16326,11 +16322,8 @@ function requireNewDatabase$7 () {
 	function newDatabase(connectionString, poolOptions) {
 		if (!connectionString)
 			throw new Error('Connection string cannot be empty');
-		var pool;
-		if (!poolOptions)
-			pool = newPool.bind(null,connectionString, poolOptions);
-		else
-			pool = newPool(connectionString, poolOptions);
+		poolOptions = poolOptions || { min: 1 };
+		var pool = newPool(connectionString, poolOptions);
 
 		let c = {poolFactory: pool, hostLocal, express};
 
@@ -16575,6 +16568,7 @@ function requireNewGenericPool$5 () {
 	function newGenericPool(connectionString, poolOptions) {
 		poolOptions = poolOptions || {};
 		var pool = genericPool.Pool({
+			min: poolOptions.min || 0,
 			max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 			idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 			reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
@@ -16673,11 +16667,8 @@ function requireNewDatabase$6 () {
 	function newDatabase(connectionString, poolOptions) {
 		if (!connectionString)
 			throw new Error('Connection string cannot be empty');
-		var pool;
-		if (!poolOptions)
-			pool = newPool.bind(null,connectionString, poolOptions);
-		else
-			pool = newPool(connectionString, poolOptions);
+		poolOptions = poolOptions || { min: 1 };
+		var pool = newPool(connectionString, poolOptions);
 
 		let c = {poolFactory: pool, hostLocal, express};
 
@@ -16941,6 +16932,7 @@ function requireNewGenericPool$4 () {
 	function newGenericPool(connectionString, poolOptions) {
 		poolOptions = poolOptions || {};
 		var pool = genericPool.Pool({
+			min: poolOptions.min || 0,
 			max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 			idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 			reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
@@ -17039,11 +17031,8 @@ function requireNewDatabase$5 () {
 	function newDatabase(connectionString, poolOptions) {
 		if (!connectionString)
 			throw new Error('Connection string cannot be empty');
-		var pool;
-		if (!poolOptions)
-			pool = newPool.bind(null,connectionString, poolOptions);
-		else
-			pool = newPool(connectionString, poolOptions);
+		poolOptions = poolOptions || { min: 1 };
+		var pool = newPool(connectionString, poolOptions);
 
 		let c = {poolFactory: pool, hostLocal, express};
 
@@ -17304,6 +17293,7 @@ function requireNewGenericPool$3 () {
 		poolOptions = poolOptions || {};
 		// @ts-ignore
 		var pool = genericPool.Pool({
+			min: poolOptions.min || 0,
 			max: 1,
 			idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 			reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
@@ -17388,11 +17378,8 @@ function requireNewDatabase$4 () {
 	function newDatabase(d1Database, poolOptions) {
 		if (!d1Database)
 			throw new Error('Missing d1Database');
-		var pool;
-		if (!poolOptions)
-			pool = newPool.bind(null,d1Database, poolOptions);
-		else
-			pool = newPool(d1Database, poolOptions);
+		poolOptions = poolOptions || { min: 1 };
+		var pool = newPool(d1Database, poolOptions);
 
 		let c = {poolFactory: pool, hostLocal, express};
 
@@ -18004,6 +17991,7 @@ function requireNewGenericPool$2 () {
 	function newGenericPool(connectionString, poolOptions) {
 		poolOptions = poolOptions || {};
 		var pool = genericPool.Pool({
+			min: poolOptions.min || 0,
 			max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 			idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 			reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
@@ -18104,11 +18092,8 @@ function requireNewDatabase$3 () {
 	function newDatabase(connectionString, poolOptions) {
 		if (!connectionString)
 			throw new Error('Connection string cannot be empty');
-		var pool;
-		if (!poolOptions)
-			pool = newPool.bind(null, connectionString, poolOptions);
-		else
-			pool = newPool(connectionString, poolOptions);
+		poolOptions = poolOptions || { min: 1 };
+		var pool = newPool(connectionString, poolOptions);
 
 		let c = { poolFactory: pool, hostLocal, express };
 
@@ -18830,6 +18815,7 @@ function requireNewGenericPool$1 () {
 			connectionString.options = { ...connectionString.options, ...{ useColumnNames: true } };
 		poolOptions = poolOptions || {};
 		var pool = genericPool.Pool({
+			min: poolOptions.min || 0,
 			max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 			idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 			reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
@@ -18932,11 +18918,8 @@ function requireNewDatabase$2 () {
 	function newDatabase(connectionString, poolOptions) {
 		if (!connectionString)
 			throw new Error('Connection string cannot be empty');
-		var pool;
-		if (!poolOptions)
-			pool = newPool.bind(null, connectionString, poolOptions);
-		else
-			pool = newPool(connectionString, poolOptions);
+		poolOptions = poolOptions || { min: 1 };
+		var pool = newPool(connectionString, poolOptions);
 
 		let c = { poolFactory: pool, hostLocal, express };
 
@@ -19527,11 +19510,8 @@ function requireNewDatabase$1 () {
 	function newDatabase(connectionString, poolOptions) {
 		if (!connectionString)
 			throw new Error('Connection string cannot be empty');
-		var pool;
-		if (!poolOptions)
-			pool = newPool.bind(null,connectionString, poolOptions);
-		else
-			pool = newPool(connectionString, poolOptions);
+		poolOptions = poolOptions || { min: 1 };
+		var pool = newPool(connectionString, poolOptions);
 
 		let c = {poolFactory: pool, hostLocal, express};
 
@@ -20211,6 +20191,7 @@ function requireNewGenericPool () {
 	function newGenericPool(connectionString, poolOptions) {
 		poolOptions = poolOptions || {};
 		var pool = genericPool.Pool({
+			min: poolOptions.min || 0,
 			max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 			idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 			reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
@@ -20313,11 +20294,8 @@ function requireNewDatabase () {
 	function newDatabase(connectionString, poolOptions) {
 		if (!connectionString)
 			throw new Error('Connection string cannot be empty');
-		var pool;
-		if (!poolOptions)
-			pool = newPool.bind(null, connectionString, poolOptions);
-		else
-			pool = newPool(connectionString, poolOptions);
+		poolOptions = poolOptions || { min: 1 };
+		var pool = newPool(connectionString, poolOptions);
 
 		let c = { poolFactory: pool, hostLocal, express };
 

package/docs/changelog.md

@@ -1,4 +1,12 @@
 ## Changelog
+__4.7.0__  
+Support for [PGLite](https://pglite.dev/). See [#124](https://github.com/alfateam/issues/124)  
+__4.6.3__  
+Bugfix:  Chained Reference relation throws if first one is null. See [#126](https://github.com/alfateam/issues/126)  
+__4.6.2__  
+Bugfix:  crashed when combining endsWith filter with other filter: e.g. `endsWith('foo').or(...)`  
+__4.6.1__  
+Bugfix:  No intellisense when running in browser mode .  See [#125](https://github.com/alfateam/issues/125)  
 __4.6.0__  
 Support for Deno and Bun.  
 Using builtin sqlite for Node22++.    

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.7.0-beta.2",
+  "version": "4.7.0",
   "main": "./src/index.js",
   "module": "./dist/index.mjs",
   "browser": "./dist/index.browser.mjs",

package/src/bunPg/newDatabase.js

@@ -15,11 +15,8 @@ let setSessionSingleton = require('../table/setSessionSingleton');
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
 		throw new Error('Connection string cannot be empty');
-	var pool;
-	if (!poolOptions)
-		pool = newPool.bind(null, connectionString, poolOptions);
-	else
-		pool = newPool(connectionString, poolOptions);
+	poolOptions = poolOptions || { min: 1 };
+	var pool = newPool(connectionString, poolOptions);
 
 	let c = { poolFactory: pool, hostLocal, express };
 

package/src/bunPg/pool/newPgPool.js

@@ -29,6 +29,7 @@ function newPgPool(connectionString, poolOptions = {}) {
 
 	//@ts-ignore
 	const pool = genericPool.Pool({
+		min: poolOptions.min || 0,
 		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,

package/src/bunSqlite/newDatabase.js

@@ -13,11 +13,8 @@ let setSessionSingleton = require('../table/setSessionSingleton');
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
 		throw new Error('Connection string cannot be empty');
-	var pool;
-	if (!poolOptions)
-		pool = newPool.bind(null,connectionString, poolOptions);
-	else
-		pool = newPool(connectionString, poolOptions);
+	poolOptions = poolOptions || { min: 1 };
+	var pool = newPool(connectionString, poolOptions);
 
 	let c = {poolFactory: pool, hostLocal, express};
 

package/src/bunSqlite/pool/newGenericPool.js

@@ -7,6 +7,7 @@ var Database;
 function newGenericPool(connectionString, poolOptions) {
 	poolOptions = poolOptions || {};
 	var pool = genericPool.Pool({
+		min: poolOptions.min || 0,
 		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,

package/src/client/index.js

@@ -65,6 +65,11 @@ function rdbClient(options = {}) {
 	client.http = onProvider.bind(null, 'http');//todo
 	client.mysql = onProvider.bind(null, 'mysql');
 	client.express = express;
+	client.close = close;
+
+	function close() {
+		return client.db.end ? client.db.end() : Promise.resolve();
+	}
 
 	function onProvider(name, ...args) {
 		let db = providers[name].apply(null, args);

package/src/d1/newDatabase.js

@@ -13,11 +13,8 @@ let setSessionSingleton = require('../table/setSessionSingleton');
 function newDatabase(d1Database, poolOptions) {
 	if (!d1Database)
 		throw new Error('Missing d1Database');
-	var pool;
-	if (!poolOptions)
-		pool = newPool.bind(null,d1Database, poolOptions);
-	else
-		pool = newPool(d1Database, poolOptions);
+	poolOptions = poolOptions || { min: 1 };
+	var pool = newPool(d1Database, poolOptions);
 
 	let c = {poolFactory: pool, hostLocal, express};
 

package/src/d1/pool/newGenericPool.js

@@ -6,6 +6,7 @@ function newGenericPool(d1Database, poolOptions) {
 	poolOptions = poolOptions || {};
 	// @ts-ignore
 	var pool = genericPool.Pool({
+		min: poolOptions.min || 0,
 		max: 1,
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,

package/src/getManyDto.js

@@ -338,8 +338,8 @@ async function decodeRelations2(context, strategy, span, rawRows, resultRows, ke
 		return decode(context, strategy[name], leg.span, rawRows, keys, updateParent);
 
 		function updateParent(subRow, i) {
-			resultRows[i][name] = subRow;
-
+			if (resultRows[i])
+				resultRows[i][name] = subRow;
 		}
 	};
 

package/src/index.d.ts

@@ -11,7 +11,7 @@ declare function r(config: r.Config): unknown;
 declare namespace r {
 
     function table(name: string): Table;
-    function end(): Promise<void>;
+    function close(): Promise<void>;
     function d1(database: D1Database, options?: PoolOptions): Pool;
     function postgres(connectionString: string, options?: PoolOptions): Pool;
     function pglite(config?: PGliteOptions | string | undefined, options?: PoolOptions): Pool;

package/src/map.d.ts

@@ -86,6 +86,7 @@ type MappedDbInstance<T> = {
 	? MappedTable<T[K]>
 	: never;
 } & {
+	close(): Promise<void>;
 	filter: Filter;
 	and(filter: Filter | RawFilter[], ...filters: RawFilter[]): Filter;
 	or(filter: Filter | RawFilter[], ...filters: RawFilter[]): Filter;

package/src/mssql/newDatabase.js

@@ -13,11 +13,8 @@ let setSessionSingleton = require('../table/setSessionSingleton');
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
 		throw new Error('Connection string cannot be empty');
-	var pool;
-	if (!poolOptions)
-		pool = newPool.bind(null, connectionString, poolOptions);
-	else
-		pool = newPool(connectionString, poolOptions);
+	poolOptions = poolOptions || { min: 1 };
+	var pool = newPool(connectionString, poolOptions);
 
 	let c = { poolFactory: pool, hostLocal, express };
 

package/src/mssql/pool/newGenericPool.js

@@ -8,6 +8,7 @@ var mssql;
 function newGenericPool(connectionString, poolOptions) {
 	poolOptions = poolOptions || {};
 	var pool = genericPool.Pool({
+		min: poolOptions.min || 0,
 		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,

package/src/mySql/newDatabase.js

@@ -13,11 +13,8 @@ let setSessionSingleton = require('../table/setSessionSingleton');
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
 		throw new Error('Connection string cannot be empty');
-	var pool;
-	if (!poolOptions)
-		pool = newPool.bind(null, connectionString, poolOptions);
-	else
-		pool = newPool(connectionString, poolOptions);
+	poolOptions = poolOptions || { min: 1 };
+	var pool = newPool(connectionString, poolOptions);
 
 	let c = { poolFactory: pool, hostLocal, express };
 

package/src/mySql/pool/newGenericPool.js

@@ -11,6 +11,7 @@ function newGenericPool(connectionString, poolOptions) {
 		connectionString.dateStrings = true;
 	poolOptions = poolOptions || {};
 	var pool = genericPool.Pool({
+		min: poolOptions.min || 0,
 		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,

package/src/nodeSqlite/newDatabase.js

@@ -13,11 +13,8 @@ let setSessionSingleton = require('../table/setSessionSingleton');
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
 		throw new Error('Connection string cannot be empty');
-	var pool;
-	if (!poolOptions)
-		pool = newPool.bind(null,connectionString, poolOptions);
-	else
-		pool = newPool(connectionString, poolOptions);
+	poolOptions = poolOptions || { min: 1 };
+	var pool = newPool(connectionString, poolOptions);
 
 	let c = {poolFactory: pool, hostLocal, express};
 

package/src/nodeSqlite/pool/newGenericPool.js

@@ -8,6 +8,7 @@ function newGenericPool(connectionString, poolOptions) {
 
 	poolOptions = poolOptions || {};
 	var pool = genericPool.Pool({
+		min: poolOptions.min || 0,
 		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,

package/src/oracle/newDatabase.js

@@ -13,11 +13,8 @@ let setSessionSingleton = require('../table/setSessionSingleton');
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
 		throw new Error('Connection string cannot be empty');
-	var pool;
-	if (!poolOptions)
-		pool = newPool.bind(null, connectionString, poolOptions);
-	else
-		pool = newPool(connectionString, poolOptions);
+	poolOptions = poolOptions || { min: 1 };
+	var pool = newPool(connectionString, poolOptions);
 
 	let c = { poolFactory: pool, hostLocal, express };
 

package/src/oracle/pool/newGenericPool.js

@@ -8,6 +8,7 @@ var oracle;
 function newGenericPool(connectionString, poolOptions) {
 	poolOptions = poolOptions || {};
 	var pool = genericPool.Pool({
+		min: poolOptions.min || 0,
 		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,

package/src/pg/newDatabase.js

@@ -15,11 +15,8 @@ let setSessionSingleton = require('../table/setSessionSingleton');
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
 		throw new Error('Connection string cannot be empty');
-	var pool;
-	if (!poolOptions)
-		pool = newPool.bind(null, connectionString, poolOptions);
-	else
-		pool = newPool(connectionString, poolOptions);
+	poolOptions = poolOptions || { min: 1 };
+	var pool = newPool(connectionString, poolOptions);
 
 	let c = { poolFactory: pool, hostLocal, express };
 

package/src/pg/pool/newPgPool.js

@@ -12,6 +12,7 @@ function newPgPool(connectionString, poolOptions) {
 
 	// @ts-ignore
 	var pool = genericPool.Pool({
+		min: poolOptions.min || 0,
 		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,

package/src/pglite/newDatabase.js

@@ -13,11 +13,8 @@ let releaseDbClient = require('../table/releaseDbClient');
 let setSessionSingleton = require('../table/setSessionSingleton');
 
 function newDatabase(connectionString, poolOptions) {
-	var pool;
-	if (!poolOptions)
-		pool = newPool.bind(null, connectionString, poolOptions);
-	else
-		pool = newPool(connectionString, poolOptions);
+	poolOptions = poolOptions || { min: 1 };
+	var pool = newPool(connectionString, poolOptions);
 
 	let c = { poolFactory: pool, hostLocal, express };
 

package/src/pglite/newTransaction.js

@@ -12,10 +12,8 @@ var quote = require('../pg/quote');
 
 function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	var rdb = { poolFactory: pool };
-	if (!pool.connect) {
+	if (!pool.connect)
 		pool = pool();
-		rdb.pool = pool;
-	}
 
 	rdb.engine = 'pg';
 	rdb.encodeDate = encodeDate;

package/src/pglite/pool/newPgPool.js

@@ -11,6 +11,7 @@ function newPgPool(connectionString, poolOptions = {}) {
 
 	//@ts-ignore
 	const pool = genericPool.Pool({
+		min: poolOptions.min || 0,
 		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,

package/src/sap/newDatabase.js

@@ -13,11 +13,8 @@ let setSessionSingleton = require('../table/setSessionSingleton');
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
 		throw new Error('Connection string cannot be empty');
-	var pool;
-	if (!poolOptions)
-		pool = newPool.bind(null,connectionString, poolOptions);
-	else
-		pool = newPool(connectionString, poolOptions);
+	poolOptions = poolOptions || { min: 1 };
+	var pool = newPool(connectionString, poolOptions);
 
 	let c = {poolFactory: pool, hostLocal, express};
 

package/src/sqlite/selectForUpdateSql.js

@@ -1,5 +1,5 @@
 const quote = require('../table/quote');
 
-module.exports = function(alias) {
-	return ' FOR UPDATE OF ' + quote(alias);
+module.exports = function(context, alias) {
+	return ' FOR UPDATE OF ' + quote(context, alias);
 };

package/src/sqlite3/newDatabase.js

@@ -13,11 +13,8 @@ let setSessionSingleton = require('../table/setSessionSingleton');
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
 		throw new Error('Connection string cannot be empty');
-	var pool;
-	if (!poolOptions)
-		pool = newPool.bind(null,connectionString, poolOptions);
-	else
-		pool = newPool(connectionString, poolOptions);
+	poolOptions = poolOptions || { min: 1 };
+	var pool = newPool(connectionString, poolOptions);
 
 	let c = {poolFactory: pool, hostLocal, express};
 

package/src/sqlite3/pool/newGenericPool.js

@@ -7,6 +7,7 @@ var sqlite;
 function newGenericPool(connectionString, poolOptions) {
 	poolOptions = poolOptions || {};
 	var pool = genericPool.Pool({
+		min: poolOptions.min || 0,
 		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,

package/src/table/column/string/endsWithCore.js

@@ -3,7 +3,7 @@ var newBoolean = require('../newBoolean');
 var nullOperator = ' is ';
 
 function endsWithCore(context, operator, column,arg,alias) {
-	alias = quote(alias);
+	alias = quote(context, alias);
 	operator = ' ' + operator + ' ';
 	var encoded = column.encode(context, arg);
 	if (encoded.sql() == 'null')

package/src/table/query/singleQuery/negotiateExclusive.js

@@ -3,7 +3,7 @@ var getSessionSingleton = require('../../getSessionSingleton');
 function negotiateExclusive(context, table, alias, _exclusive) {
 	if (table._exclusive || _exclusive) {
 		var encode =  getSessionSingleton(context, 'selectForUpdateSql');
-		return encode(alias);
+		return encode(context, alias);
 	}
 	return '';
 }

package/src/tedious/newDatabase.js

@@ -13,11 +13,8 @@ let setSessionSingleton = require('../table/setSessionSingleton');
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
 		throw new Error('Connection string cannot be empty');
-	var pool;
-	if (!poolOptions)
-		pool = newPool.bind(null, connectionString, poolOptions);
-	else
-		pool = newPool(connectionString, poolOptions);
+	poolOptions = poolOptions || { min: 1 };
+	var pool = newPool(connectionString, poolOptions);
 
 	let c = { poolFactory: pool, hostLocal, express };
 

package/src/tedious/pool/newGenericPool.js

@@ -13,6 +13,7 @@ function newGenericPool(connectionString, poolOptions) {
 		connectionString.options = { ...connectionString.options, ...{ useColumnNames: true } };
 	poolOptions = poolOptions || {};
 	var pool = genericPool.Pool({
+		min: poolOptions.min || 0,
 		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,