orange-orm 5.0.0-beta.0 → 5.0.0-beta.10

package/README.md

@@ -134,7 +134,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const orders = await db.order.getAll({
+  const orders = await db.order.getMany({
     where: x => x.lines.any(line => line.product.contains('broomstick'))
       .and(x.customer.name.startsWith('Harry')),
     lines: {
@@ -312,29 +312,8 @@ __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.  
 
 __SQLite user-defined functions__  
-You can register custom SQLite functions on the connection using `db.function(name, fn)`.  
-
-```javascript
-import map from './map';
-const db = map.sqlite('demo.db');
-
-db.function('add_prefix', (text, prefix) => `${prefix}${text}`);
-
-const rows = await db.query(
-  "select id, name, add_prefix(name, '[VIP] ') as prefixedName from customer"
-);
-```
-
-If you need the function inside a transaction, register it within the transaction callback to ensure it is available on that connection.  
-
-```javascript
-await db.transaction(async (db) => {
-  db.function('add_prefix', (text, prefix) => `${prefix}${text}`);
-  return db.query(
-    "select id, name, add_prefix(name, '[VIP] ') as prefixedName from customer"
-  );
-});
-```
+You can register custom SQLite functions using `db.function(name, fn)`.  
+For full behavior, runtime caveats, and examples, see [SQLite user-defined functions](#sqlite-user-defined-functions).
 
 __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)  
@@ -445,7 +424,7 @@ export interface Env {
 export default {
   async fetch(request, env): Promise<Response> {
     const db = map.d1(env.DB);
-    const customers = await db.customer.getAll();
+    const customers = await db.customer.getMany();
     return Response.json(customers);
   },
 } satisfies ExportedHandler<Env>;
@@ -613,7 +592,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const orders = await db.order.getAll({
+  const orders = await db.order.getMany({
     customer: true, 
     deliveryAddress: true, 
     lines: {
@@ -632,7 +611,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const orders = await db.order.getAll({
+  const orders = await db.order.getMany({
     offset: 1,
     orderBy: ['orderDate desc', 'id'],
     limit: 10,
@@ -664,7 +643,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const orders = await db.order.getAll({
+  const orders = await db.order.getMany({
     numberOfLines: x => x.count(x => x.lines.id),
     totalAmount: x => x.sum(x => lines.amount),
     balance: x => x.customer.balance
@@ -681,7 +660,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const orders = await db.order.getAll({
+  const orders = await db.order.getMany({
     where: x => x.lines.any(line => line.product.contains('i'))
       .and(x.customer.balance.greaterThan(180)),
     customer: true, 
@@ -690,14 +669,13 @@ async function getRows() {
   });
 }
 ```
-You can also use the alternative syntax for the `where-filter`. This way, the filter can be constructed independently from the fetching strategy. Keep in mind that you must use the `getMany` method instead of the `getAll` method.  
-It is also possible to combine `where-filter` with the independent filter when using the `getMany` method.  
+You can also build the `where` filter separately and pass it in via the `where` clause. This keeps the filter independent of the fetching strategy and easier to reuse.  
 ```javascript
 async function getRows() {
   const filter = db.order.lines.any(line => line.product.contains('i'))
                  .and(db.order.customer.balance.greaterThan(180));
-  const orders = await db.order.getMany(filter, {
-    //where: x => ... can be combined as well
+  const orders = await db.order.getMany({
+    where: filter,
     customer: true, 
     deliveryAddress: true, 
     lines: true
@@ -714,7 +692,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const order = await db.order.getOne(undefined /* optional filter */, {
+  const order = await db.order.getOne({
     where: x => x.customer(customer => customer.isActive.eq(true)
                  .and(customer.startsWith('Harr'))),
     customer: true, 
@@ -723,15 +701,16 @@ async function getRows() {
   });
 }
 ```
-You can use also the alternative syntax for the `where-filter`. This way, the filter can be constructed independently from the fetching strategy.    
-It is also possible to combine `where-filter` with the independent filter when using the `getOne` method.  
+You can also build the `where` filter independently and reuse it.    
+With `getOne`, you can combine the positional `where` filter with the `where` option to compose filters.  
 ```javascript
 async function getRows() {
   const filter = db.order.customer(customer => customer.isActive.eq(true)
                  .and(customer.startsWith('Harr')));
-                 //equivalent, but creates slighly different sql:
+                 // equivalent, but creates slightly different SQL:
                  // const filter = db.order.customer.isActive.eq(true).and(db.order.customer.startsWith('Harr'));
-  const order = await db.order.getOne(filter, {
+  const order = await db.order.getOne({
+    where: filter,
     customer: true, 
     deliveryAddress: true, 
     lines: true
@@ -812,7 +791,7 @@ const db = map.sqlite('demo.db');
 update();
 
 async function update() {
-  let orders = await db.order.getAll({
+  let orders = await db.order.getMany({
     orderBy: 'id',
     lines: true, 
     deliveryAddress: true, 
@@ -1045,7 +1024,7 @@ const db = map.sqlite('demo.db');
 updateInsertDelete();
 
 async function updateInsertDelete() {    
-  const orders = await db.order.getAll({
+  const orders = await db.order.getMany({
     customer: true, 
     deliveryAddress: true, 
     lines: true
@@ -1092,7 +1071,7 @@ const db = map.sqlite('demo.db');
 deleteRows();
 
 async function deleteRows() {  
-  let orders = await db.order.getAll({
+  let orders = await db.order.getMany({
     where: x => x.customer.name.eq('George')
   });
 
@@ -1108,7 +1087,7 @@ const db = map.sqlite('demo.db');
 deleteRows();
 
 async function deleteRows() {
-  let orders = await db.order.getAll({
+  let orders = await db.order.getMany({
     where: x => x.deliveryAddress.name.eq('George'),
     customer: true, 
     deliveryAddress: true, 
@@ -1193,6 +1172,7 @@ express().disable('x-powered-by')
 ```
 
 <sub>📄 browser.ts</sub>
+
 ```ts
 import map from './map';
 
@@ -1201,7 +1181,7 @@ const db = map.http('http://localhost:3000/orange');
 updateRows();
 
 async function updateRows() {
-  const order = await db.order.getOne(undefined, {
+  const order = await db.order.getOne({
     where: x => x.lines.any(line => line.product.startsWith('Magic wand'))
       .and(x.customer.name.startsWith('Harry'),
     lines: true
@@ -1286,7 +1266,7 @@ async function updateRows() {
     }
   );
 
-  const order = await db.order.getOne(undefined, {
+  const order = await db.order.getOne({
     where: x => x.lines.any(line => line.product.startsWith('Magic wand'))
       .and(db.order.customer.name.startsWith('Harry')),
     lines: true
@@ -1419,7 +1399,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.order.getAll({
+  const rows = await db.order.getMany({
     deliveryAddress: true 
   });  
 }
@@ -1435,7 +1415,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.order.getAll({
+  const rows = await db.order.getMany({
     orderDate: false,
     deliveryAddress: {
       countryCode: true,
@@ -1459,7 +1439,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.customer.getAll({
+  const rows = await db.customer.getMany({
     where x => x.name.equal('Harry')
   });
 }
@@ -1472,7 +1452,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.customer.getAll({
+  const rows = await db.customer.getMany({
     where x => x.name.notEqual('Harry')
   });
 }
@@ -1485,7 +1465,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.customer.getAll({
+  const rows = await db.customer.getMany({
     where: x => x.name.contains('arr')
   });
 }
@@ -1500,7 +1480,7 @@ getRows();
 async function getRows() {
   const filter = db.customer.name.startsWith('Harr');
 
-  const rows = await db.customer.getAll({
+  const rows = await db.customer.getMany({
     where: x => x.name.startsWith('Harr')
   });
 }
@@ -1513,7 +1493,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.customer.getAll({
+  const rows = await db.customer.getMany({
     where: x => x.name.endsWith('arry')
   });
 }
@@ -1526,7 +1506,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.order.getAll({
+  const rows = await db.order.getMany({
     where: x => x.orderDate.greaterThan('2023-07-14T12:00:00')
   });
 }
@@ -1539,7 +1519,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.order.getAll({
+  const rows = await db.order.getMany({
     where: x => x.orderDate.greaterThanOrEqual('2023-07-14T12:00:00')
   });
 }
@@ -1552,7 +1532,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.order.getAll({
+  const rows = await db.order.getMany({
     where: x => x.orderDate.lessThan('2023-07-14T12:00:00')
   });
 }
@@ -1565,7 +1545,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.order.getAll({
+  const rows = await db.order.getMany({
     where: x => x.orderDate.lessThanOrEqual('2023-07-14T12:00:00')
   });
 }
@@ -1578,7 +1558,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.order.getAll({
+  const rows = await db.order.getMany({
     where: x => x.orderDate.between('2023-07-14T12:00:00', '2024-07-14T12:00:00')
   });
 }
@@ -1591,7 +1571,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.order.getAll({
+  const rows = await db.order.getMany({
     where: x => x.customer.name.in('George', 'Harry')
   });
 
@@ -1613,11 +1593,11 @@ async function getRows() {
     parameters: ['%arry']
   };                 
   
-  const rowsWithRaw = await db.customer.getAll({
+  const rowsWithRaw = await db.customer.getMany({
     where: () => rawFilter
   });
 
-  const rowsWithCombined = await db.customer.getAll({
+  const rowsWithCombined = await db.customer.getMany({
     where: x => x.balance.greaterThan(100).and(rawFilter)
   });  
 }
@@ -1635,7 +1615,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const orders = await db.order.getAll({
+  const orders = await db.order.getMany({
     lines: {
       where: x => x.product.contains('broomstick')
     },
@@ -1657,7 +1637,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.order.getAll({
+  const rows = await db.order.getMany({
     where: x => x.customer.name.equal('Harry')
       .and(x.orderDate.greaterThan('2023-07-14T12:00:00'))
   });  
@@ -1672,7 +1652,7 @@ getRows();
 
 async function getRows() {
 
-  const rows = await db.order.getAll({
+  const rows = await db.order.getMany({
     where: y => y.customer( x => x.name.equal('George')
       .or(x.name.equal('Harry')))
   });  
@@ -1687,7 +1667,7 @@ getRows();
 
 async function getRows() {
   //Neither George nor Harry
-  const rows = await db.order.getAll({
+  const rows = await db.order.getMany({
     where: y => y.customer(x => x.name.equal('George')
         .or(x.name.equal('Harry')))
       .not()
@@ -1702,7 +1682,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.order.getAll({
+  const rows = await db.order.getMany({
     where: x => x.deliveryAddress.exists()
   });  
 }
@@ -1723,7 +1703,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.order.getAll({
+  const rows = await db.order.getMany({
     where: y => y.lines.any(x => x.product.contains('guitar'))
     //equivalent syntax:
     //where: x => x.lines.product.contains('guitar')
@@ -1739,7 +1719,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.order.getAll({
+  const rows = await db.order.getMany({
     where: y => y.lines.all(x => x.product.contains('a'))
   });  
 }
@@ -1753,7 +1733,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const rows = await db.order.getAll({
+  const rows = await db.order.getMany({
     where: y => y.lines.none(x => x.product.equal('Magic wand'))
   });  
 }
@@ -2181,6 +2161,43 @@ async function getRows() {
 ```
 </details>
 
+<details id="sqlite-user-defined-functions"><summary><strong>SQLite user-defined functions</strong></summary>
+
+You can register custom SQLite functions on the connection using `db.function(name, fn)`.
+
+The `fn` argument is your user-defined callback:
+- It is invoked by SQLite every time the SQL function is called.
+- Callback arguments are positional and match the SQL call (for example, `my_fn(a, b)` maps to `(a, b)`).
+- Return a SQLite-compatible scalar value (for example text, number, or `null`).
+- Throwing inside the callback fails the SQL statement.
+
+`db.function(...)` is sync-only in Node and Deno, but can be async or sync in Bun.
+
+```javascript
+import map from './map';
+const db = map.sqlite('demo.db');
+
+await db.function('add_prefix', (text, prefix) => `${prefix}${text}`);
+
+const rows = await db.query(
+  "select id, name, add_prefix(name, '[VIP] ') as prefixedName from customer"
+);
+```
+
+If you need the function inside a transaction, register it within the transaction callback to ensure it is available on that connection.
+
+```javascript
+await db.transaction(async (db) => {
+  await db.function('add_prefix', (text, prefix) => `${prefix}${text}`);
+  return db.query(
+    "select id, name, add_prefix(name, '[VIP] ') as prefixedName from customer"
+  );
+});
+```
+
+`db.function(...)` is available on direct SQLite connections (for example `map.sqlite(...)`) and not through `map.http(...)`.
+</details>
+
 <details id="aggregates"><summary><strong>Aggregate functions</strong></summary>
 
 You can count records and aggregate numerical columns.  This can either be done across rows or separately for each row.  
@@ -2202,7 +2219,7 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const orders = await db.order.getAll({
+  const orders = await db.order.getMany({
     numberOfLines: x => x.count(x => x.lines.id),
     totalAmount: x => x.sum(x => lines.amount),
     balance: x => x.customer.balance

package/dist/index.browser.mjs

@@ -1076,6 +1076,10 @@ function requireUtils () {
 		};
 
 		c.and = function(context, other) {
+			if (other === undefined) {
+				other = context;
+				context = null;
+			}
 			other = negotiateRawSqlFilter(context, other);
 			var nextFilter = negotiateNextAndFilter(filter, other);
 			var next = newBoolean(nextFilter);
@@ -1086,6 +1090,10 @@ function requireUtils () {
 		};
 
 		c.or = function(context, other) {
+			if (other === undefined) {
+				other = context;
+				context = null;
+			}
 			other = negotiateRawSqlFilter(context, other);
 			var nextFilter = negotiateNextOrFilter(filter, other);
 			var next = newBoolean(nextFilter);
@@ -1197,10 +1205,14 @@ function requireEmptyFilter () {
 		return emptyFilter.and.apply(null, arguments);
 	}
 
-	emptyFilter.sql = parameterized.sql;
+	emptyFilter.sql = parameterized.sql.bind(parameterized);
 	emptyFilter.parameters = parameterized.parameters;
 
 	emptyFilter.and = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other);
 		for (var i = 2; i < arguments.length; i++) {
 			other = other.and(context, arguments[i]);
@@ -1209,6 +1221,10 @@ function requireEmptyFilter () {
 	};
 
 	emptyFilter.or = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other);
 		for (var i = 2; i < arguments.length; i++) {
 			other = other.or(context, arguments[i]);
@@ -1217,6 +1233,10 @@ function requireEmptyFilter () {
 	};
 
 	emptyFilter.not = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other).not(context);
 		for (var i = 2; i < arguments.length; i++) {
 			other = other.and(context, arguments[i]);
@@ -2098,9 +2118,14 @@ function requireExecuteQueriesCore () {
 
 	function executeQueriesCore(context, queries) {
 		var promises = [];
+		var chain = Promise.resolve();
 		for (var i = 0; i < queries.length; i++) {
-			var q = executeQuery(context, queries[i]);
+			// Serialize execution while still returning an array of promises
+			var q = chain.then(function(qi) {
+				return executeQuery(context, qi);
+			}.bind(null, queries[i]));
 			promises.push(q);
+			chain = q;
 		}
 		return promises;
 	}
@@ -3958,6 +3983,8 @@ function requireClient () {
 		const handler = {
 			get(target, prop, receiver) {
 				const value = Reflect.get(target, prop, receiver);
+				if (value instanceof Date)
+					return value;
 				if (typeof value === 'object' && value !== null) {
 					return new Proxy(value, handler);
 				}
@@ -4461,7 +4488,7 @@ function requireNewColumn () {
 			alias = extractAlias(alias);
 			from = c.greaterThanOrEqual(context, from, alias);
 			to = c.lessThanOrEqual(context, to, alias);
-			return from.and(to);
+			return from.and(context, to);
 		};
 
 		c.in = function(context, arg, alias) {
@@ -9022,6 +9049,7 @@ function requireGetRelatives$1 () {
 
 	function getRelatives(context, parent, relation) {
 		var queryContext = parent.queryContext;
+		var ctx = context === undefined ? null : context;
 		let strategy = queryContext && queryContext.strategy[relation.leftAlias];
 		var filter = emptyFilter;
 		if (relation.columns.length === 1)
@@ -9042,7 +9070,7 @@ function requireGetRelatives$1 () {
 			}
 
 			if (ids.length > 0)
-				filter = relation.childTable._primaryColumns[0].in(context, ids);
+				filter = relation.childTable._primaryColumns[0].in(ctx, ids);
 		}
 
 		function createCompositeFilter() {
@@ -9050,7 +9078,7 @@ function requireGetRelatives$1 () {
 			for (var i = 0; i < queryContext.rows.length; i++) {
 				keyFilter = rowToPrimaryKeyFilter(context, queryContext.rows[i], relation);
 				if (keyFilter)
-					filter = filter.or(context, keyFilter);
+					filter = filter.or(ctx, keyFilter);
 			}
 		}
 
@@ -10074,7 +10102,7 @@ function requireNewOneLeg () {
 		c.expand = relation.expand;
 
 		c.accept = function(visitor) {
-			visitor.visitOne(c);
+			return visitor.visitOne(c);
 		};
 
 		return c;
@@ -12773,7 +12801,10 @@ function requireTable () {
 			row[property] = value;
 		};
 
-		table.delete = _delete.bind(null, table);
+		table.delete = function(context, ...rest) {
+			const args = [context, table, ...rest];
+			return _delete.apply(null, args);
+		};
 		table.cascadeDelete = function(context, ...rest) {
 			const args = [context, table, ...rest];
 			return cascadeDelete.apply(null, args);

package/dist/index.mjs

@@ -1077,6 +1077,10 @@ function requireUtils () {
 		};
 
 		c.and = function(context, other) {
+			if (other === undefined) {
+				other = context;
+				context = null;
+			}
 			other = negotiateRawSqlFilter(context, other);
 			var nextFilter = negotiateNextAndFilter(filter, other);
 			var next = newBoolean(nextFilter);
@@ -1087,6 +1091,10 @@ function requireUtils () {
 		};
 
 		c.or = function(context, other) {
+			if (other === undefined) {
+				other = context;
+				context = null;
+			}
 			other = negotiateRawSqlFilter(context, other);
 			var nextFilter = negotiateNextOrFilter(filter, other);
 			var next = newBoolean(nextFilter);
@@ -1198,10 +1206,14 @@ function requireEmptyFilter () {
 		return emptyFilter.and.apply(null, arguments);
 	}
 
-	emptyFilter.sql = parameterized.sql;
+	emptyFilter.sql = parameterized.sql.bind(parameterized);
 	emptyFilter.parameters = parameterized.parameters;
 
 	emptyFilter.and = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other);
 		for (var i = 2; i < arguments.length; i++) {
 			other = other.and(context, arguments[i]);
@@ -1210,6 +1222,10 @@ function requireEmptyFilter () {
 	};
 
 	emptyFilter.or = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other);
 		for (var i = 2; i < arguments.length; i++) {
 			other = other.or(context, arguments[i]);
@@ -1218,6 +1234,10 @@ function requireEmptyFilter () {
 	};
 
 	emptyFilter.not = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other).not(context);
 		for (var i = 2; i < arguments.length; i++) {
 			other = other.and(context, arguments[i]);
@@ -2099,9 +2119,14 @@ function requireExecuteQueriesCore () {
 
 	function executeQueriesCore(context, queries) {
 		var promises = [];
+		var chain = Promise.resolve();
 		for (var i = 0; i < queries.length; i++) {
-			var q = executeQuery(context, queries[i]);
+			// Serialize execution while still returning an array of promises
+			var q = chain.then(function(qi) {
+				return executeQuery(context, qi);
+			}.bind(null, queries[i]));
 			promises.push(q);
+			chain = q;
 		}
 		return promises;
 	}
@@ -3959,6 +3984,8 @@ function requireClient () {
 		const handler = {
 			get(target, prop, receiver) {
 				const value = Reflect.get(target, prop, receiver);
+				if (value instanceof Date)
+					return value;
 				if (typeof value === 'object' && value !== null) {
 					return new Proxy(value, handler);
 				}
@@ -4462,7 +4489,7 @@ function requireNewColumn () {
 			alias = extractAlias(alias);
 			from = c.greaterThanOrEqual(context, from, alias);
 			to = c.lessThanOrEqual(context, to, alias);
-			return from.and(to);
+			return from.and(context, to);
 		};
 
 		c.in = function(context, arg, alias) {
@@ -9023,6 +9050,7 @@ function requireGetRelatives$1 () {
 
 	function getRelatives(context, parent, relation) {
 		var queryContext = parent.queryContext;
+		var ctx = context === undefined ? null : context;
 		let strategy = queryContext && queryContext.strategy[relation.leftAlias];
 		var filter = emptyFilter;
 		if (relation.columns.length === 1)
@@ -9043,7 +9071,7 @@ function requireGetRelatives$1 () {
 			}
 
 			if (ids.length > 0)
-				filter = relation.childTable._primaryColumns[0].in(context, ids);
+				filter = relation.childTable._primaryColumns[0].in(ctx, ids);
 		}
 
 		function createCompositeFilter() {
@@ -9051,7 +9079,7 @@ function requireGetRelatives$1 () {
 			for (var i = 0; i < queryContext.rows.length; i++) {
 				keyFilter = rowToPrimaryKeyFilter(context, queryContext.rows[i], relation);
 				if (keyFilter)
-					filter = filter.or(context, keyFilter);
+					filter = filter.or(ctx, keyFilter);
 			}
 		}
 
@@ -10075,7 +10103,7 @@ function requireNewOneLeg () {
 		c.expand = relation.expand;
 
 		c.accept = function(visitor) {
-			visitor.visitOne(c);
+			return visitor.visitOne(c);
 		};
 
 		return c;
@@ -12774,7 +12802,10 @@ function requireTable () {
 			row[property] = value;
 		};
 
-		table.delete = _delete.bind(null, table);
+		table.delete = function(context, ...rest) {
+			const args = [context, table, ...rest];
+			return _delete.apply(null, args);
+		};
 		table.cascadeDelete = function(context, ...rest) {
 			const args = [context, table, ...rest];
 			return cascadeDelete.apply(null, args);
@@ -19655,7 +19686,7 @@ function requireOutputInsertedSql () {
 
 		function formatColumn(column) {
 			if (column.formatOut)
-				return column.formatOut(context, 'INSERTED');
+				return `${column.formatOut(context, 'INSERTED')} AS [${column._dbName}]`;
 			else
 				return `INSERTED.[${column._dbName}]`;
 		}
@@ -20236,18 +20267,28 @@ function requireWrapQuery$1 () {
 		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);
-			}
+			enqueue(function(done) {
+				function safeCompleted(err, rows) {
+					try {
+						onCompleted(err, rows);
+					} finally {
+						done();
+					}
+				}
+
+				if (!CachedRequest || !CachedTypes) {
+					import('tedious')
+						.then(({ Request, TYPES }) => {
+							CachedRequest = Request;
+							CachedTypes = TYPES;
+							doQuery(query, safeCompleted);
+						})
+						.catch(err => safeCompleted(extractError(err), []));
+				}
+				else {
+					doQuery(query, safeCompleted);
+				}
+			});
 		}
 
 		function doQuery(query, onCompleted) {
@@ -20348,6 +20389,19 @@ function requireWrapQuery$1 () {
 				}
 			}
 		}
+
+		function enqueue(task) {
+			if (!connection.__orangeOrmQueue)
+				connection.__orangeOrmQueue = Promise.resolve();
+			connection.__orangeOrmQueue = connection.__orangeOrmQueue.then(() => new Promise((resolve) => {
+				try {
+					task(resolve);
+				}
+				catch (_e) {
+					resolve();
+				}
+			})).catch(() => {});
+		}
 	}
 
 	// Helper functions remain the same
@@ -20427,17 +20481,27 @@ function requireWrapCommand$1 () {
 		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), { rowsAffected: 0 }));
-			} else {
-				doQuery(query, onCompleted);
-			}
+			enqueue(function(done) {
+				function safeCompleted(err, result) {
+					try {
+						onCompleted(err, result);
+					} finally {
+						done();
+					}
+				}
+
+				if (!CachedRequest || !CachedTypes) {
+					import('tedious')
+						.then(({ Request, TYPES }) => {
+							CachedRequest = Request;
+							CachedTypes = TYPES;
+							doQuery(query, safeCompleted);
+						})
+						.catch((err) => safeCompleted(extractError(err), { rowsAffected: 0 }));
+				} else {
+					doQuery(query, safeCompleted);
+				}
+			});
 		}
 
 		function doQuery(query, onCompleted) {
@@ -20490,6 +20554,19 @@ function requireWrapCommand$1 () {
 				return onCompleted(null, { rowsAffected: affectedRows });
 			}
 		}
+
+		function enqueue(task) {
+			if (!connection.__orangeOrmQueue)
+				connection.__orangeOrmQueue = Promise.resolve();
+			connection.__orangeOrmQueue = connection.__orangeOrmQueue.then(() => new Promise((resolve) => {
+				try {
+					task(resolve);
+				}
+				catch (_e) {
+					resolve();
+				}
+			})).catch(() => {});
+		}
 	}
 
 	function extractError(e) {

package/docs/changelog.md

@@ -1,4 +1,9 @@
 ## Changelog
+__5.0.0__  
+Breaking: `getAll` was removed. Use `getMany` instead (now with the same signature as the removed `getAll`).  
+ExpressJS: Before/after hooks to facilitate row-level security [#135](https://github.com/alfateam/orange-orm/issues/135)  
+SQLite: Support for invoking user-defined functions [#145](https://github.com/alfateam/orange-orm/issues/145)  
+Support for enums [#100](https://github.com/alfateam/orange-orm/issues/100)  
 __4.9.1__  
 Fix: Avoid double-quoting aliases in discriminator join SQL [#144](https://github.com/alfateam/orange-orm/issues/144)    
 __4.9.0__  

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "orange-orm",
-    "version": "5.0.0-beta.0",
+    "version": "5.0.0-beta.10",
     "publishConfig": {
         "access": "public"
     },

package/src/client/index.js

@@ -1104,6 +1104,8 @@ function onChange(target, onChange) {
 	const handler = {
 		get(target, prop, receiver) {
 			const value = Reflect.get(target, prop, receiver);
+			if (value instanceof Date)
+				return value;
 			if (typeof value === 'object' && value !== null) {
 				return new Proxy(value, handler);
 			}

package/src/emptyFilter.js

@@ -4,10 +4,14 @@ function emptyFilter() {
 	return emptyFilter.and.apply(null, arguments);
 }
 
-emptyFilter.sql = parameterized.sql;
+emptyFilter.sql = parameterized.sql.bind(parameterized);
 emptyFilter.parameters = parameterized.parameters;
 
 emptyFilter.and = function(context, other) {
+	if (other === undefined) {
+		other = context;
+		context = null;
+	}
 	other = negotiateRawSqlFilter(context, other);
 	for (var i = 2; i < arguments.length; i++) {
 		other = other.and(context, arguments[i]);
@@ -16,6 +20,10 @@ emptyFilter.and = function(context, other) {
 };
 
 emptyFilter.or = function(context, other) {
+	if (other === undefined) {
+		other = context;
+		context = null;
+	}
 	other = negotiateRawSqlFilter(context, other);
 	for (var i = 2; i < arguments.length; i++) {
 		other = other.or(context, arguments[i]);
@@ -24,6 +32,10 @@ emptyFilter.or = function(context, other) {
 };
 
 emptyFilter.not = function(context, other) {
+	if (other === undefined) {
+		other = context;
+		context = null;
+	}
 	other = negotiateRawSqlFilter(context, other).not(context);
 	for (var i = 2; i < arguments.length; i++) {
 		other = other.and(context, arguments[i]);

package/src/map2.d.ts

@@ -166,7 +166,7 @@ type BaseFetchStrategy<M extends Record<string, TableDefinition<M>>, K extends k
   orderBy?: OrderBy<M, K>;
   limit?: number;
   offset?: number;
-  where?: WhereFunc<M, K>;
+  where?: WhereClause<M, K>;
 };
 
 export type PrimaryKeyObject<M extends Record<string, TableDefinition<M>>, K extends keyof M> =
@@ -344,18 +344,25 @@ export type AggregateStrategy<M extends Record<string, TableDefinition<M>>, K ex
   BaseAggregateStrategy<M, K>
   | CustomAggregateSelectors<M, K>;
 
-type WhereFunc<M extends Record<string, TableDefinition<M>>, K extends keyof M> = (row: RootTableRefs<M, K>) => RawFilter | Array<PrimaryKeyObject<M, K>>;
+type WhereFilter<M extends Record<string, TableDefinition<M>>, K extends keyof M> =
+  RawFilter | Array<PrimaryKeyObject<M, K>>;
+
+type WhereFunc<M extends Record<string, TableDefinition<M>>, K extends keyof M> =
+  (row: RootTableRefs<M, K>) => WhereFilter<M, K>;
+
+type WhereClause<M extends Record<string, TableDefinition<M>>, K extends keyof M> =
+  WhereFilter<M, K> | WhereFunc<M, K> | (() => WhereFilter<M, K>);
 
 type BaseAggregateStrategy<M extends Record<string, TableDefinition<M>>, K extends keyof M> = {
   limit?: number;
   offset?: number;
-  where?: WhereFunc<M, K>;
+  where?: WhereClause<M, K>;
 };
 
 type CustomAggregateSelectors<M extends Record<string, TableDefinition<M>>, K extends keyof M> = {
   [key: string]: (row: RootSelectionRefs<M, K>) => ValidSelectorReturnTypes<M, K>;
 } & {
-  where?: WhereFunc<M, K>;
+  where?: WhereClause<M, K>;
 } & {
   // Explicitly prevent limit/offset in selectors
   limit?: never;
@@ -683,7 +690,7 @@ export type TableClient<M extends Record<string, TableDefinition<M>>, K extends
   aggregate<strategy extends AggregateStrategy<M, K>>(strategy: strategy): Promise<Array<DeepExpand<AggregateCustomSelectorProperties<M, K, strategy>>>>;
 
   // Single item methods - return individual objects with individual active record methods
-  getOne<strategy extends FetchStrategy<M, K> = {}>(
+  getOne<strategy extends FetchStrategy<M, K>>(
     strategy?: strategy
   ): Promise<WithActiveRecord<DeepExpand<Selection<M, K, strategy>>, M, K> | undefined>;
 
@@ -698,12 +705,12 @@ export type TableClient<M extends Record<string, TableDefinition<M>>, K extends
   // UPDATED: Bulk update methods with relations support
   update(
     row: UpdateRowWithRelations<M, K>,
-    opts: { where: (row: RootTableRefs<M, K>) => RawFilter | Array<PrimaryKeyObject<M, K>> }
+    opts: { where: WhereClause<M, K> }
   ): Promise<void>;
 
   update<strategy extends FetchStrategy<M, K>>(
     row: UpdateRowWithRelations<M, K>,
-    opts: { where: (row: RootTableRefs<M, K>) => RawFilter | Array<PrimaryKeyObject<M, K>> },
+    opts: { where: WhereClause<M, K> },
     strategy: strategy
   ): Promise<WithArrayActiveRecord<Array<DeepExpand<Selection<M, K, strategy>>>, M, K>>;
 

package/src/table/column/newColumn.js

@@ -55,7 +55,7 @@ module.exports = function(table, name) {
 		alias = extractAlias(alias);
 		from = c.greaterThanOrEqual(context, from, alias);
 		to = c.lessThanOrEqual(context, to, alias);
-		return from.and(to);
+		return from.and(context, to);
 	};
 
 	c.in = function(context, arg, alias) {
@@ -102,4 +102,4 @@ module.exports = function(table, name) {
 	}
 
 	return c;
-};
+};

package/src/table/column/utils.js

@@ -18,6 +18,10 @@ function newBoolean(filter) {
 	};
 
 	c.and = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other);
 		var nextFilter = negotiateNextAndFilter(filter, other);
 		var next = newBoolean(nextFilter);
@@ -28,6 +32,10 @@ function newBoolean(filter) {
 	};
 
 	c.or = function(context, other) {
+		if (other === undefined) {
+			other = context;
+			context = null;
+		}
 		other = negotiateRawSqlFilter(context, other);
 		var nextFilter = negotiateNextOrFilter(filter, other);
 		var next = newBoolean(nextFilter);

package/src/table/executeQueries/executeQueriesCore.js

@@ -2,11 +2,16 @@ var executeQuery = require('./executeQuery');
 
 function executeQueriesCore(context, queries) {
 	var promises = [];
+	var chain = Promise.resolve();
 	for (var i = 0; i < queries.length; i++) {
-		var q = executeQuery(context, queries[i]);
+		// Serialize execution while still returning an array of promises
+		var q = chain.then(function(qi) {
+			return executeQuery(context, qi);
+		}.bind(null, queries[i]));
 		promises.push(q);
+		chain = q;
 	}
 	return promises;
 }
 
-module.exports = executeQueriesCore;
+module.exports = executeQueriesCore;

package/src/table/joinRelation/getRelatives.js

@@ -4,6 +4,7 @@ var negotiateExpandInverse = require('../negotiateExpandInverse');
 
 function getRelatives(context, parent, relation) {
 	var queryContext = parent.queryContext;
+	var ctx = context === undefined ? null : context;
 	let strategy = queryContext && queryContext.strategy[relation.leftAlias];
 	var filter = emptyFilter;
 	if (relation.columns.length === 1)
@@ -24,7 +25,7 @@ function getRelatives(context, parent, relation) {
 		}
 
 		if (ids.length > 0)
-			filter = relation.childTable._primaryColumns[0].in(context, ids);
+			filter = relation.childTable._primaryColumns[0].in(ctx, ids);
 	}
 
 	function createCompositeFilter() {
@@ -32,7 +33,7 @@ function getRelatives(context, parent, relation) {
 		for (var i = 0; i < queryContext.rows.length; i++) {
 			keyFilter = rowToPrimaryKeyFilter(context, queryContext.rows[i], relation);
 			if (keyFilter)
-				filter = filter.or(context, keyFilter);
+				filter = filter.or(ctx, keyFilter);
 		}
 	}
 
@@ -61,4 +62,4 @@ function isNullOrUndefined(item) {
 	return item === null || item === undefined;
 }
 
-module.exports = getRelatives;
+module.exports = getRelatives;

package/src/table/relation/newOneLeg.js

@@ -16,7 +16,7 @@ function newLeg(relation) {
 	c.expand = relation.expand;
 
 	c.accept = function(visitor) {
-		visitor.visitOne(c);
+		return visitor.visitOne(c);
 	};
 
 	return c;

package/src/table.js

@@ -192,7 +192,10 @@ function _new(tableName) {
 		row[property] = value;
 	};
 
-	table.delete = _delete.bind(null, table);
+	table.delete = function(context, ...rest) {
+		const args = [context, table, ...rest];
+		return _delete.apply(null, args);
+	};
 	table.cascadeDelete = function(context, ...rest) {
 		const args = [context, table, ...rest];
 		return cascadeDelete.apply(null, args);

package/src/tedious/outputInsertedSql.js

@@ -9,7 +9,7 @@ function outputInsertedSql(context, table) {
 
 	function formatColumn(column) {
 		if (column.formatOut)
-			return column.formatOut(context, 'INSERTED');
+			return `${column.formatOut(context, 'INSERTED')} AS [${column._dbName}]`;
 		else
 			return `INSERTED.[${column._dbName}]`;
 	}
@@ -17,4 +17,4 @@ function outputInsertedSql(context, table) {
 
 
 
-module.exports = outputInsertedSql;
+module.exports = outputInsertedSql;

package/src/tedious/wrapCommand.js

@@ -7,17 +7,27 @@ function wrapCommand(_context, connection) {
 	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), { rowsAffected: 0 }));
-		} else {
-			doQuery(query, onCompleted);
-		}
+		enqueue(function(done) {
+			function safeCompleted(err, result) {
+				try {
+					onCompleted(err, result);
+				} finally {
+					done();
+				}
+			}
+
+			if (!CachedRequest || !CachedTypes) {
+				import('tedious')
+					.then(({ Request, TYPES }) => {
+						CachedRequest = Request;
+						CachedTypes = TYPES;
+						doQuery(query, safeCompleted);
+					})
+					.catch((err) => safeCompleted(extractError(err), { rowsAffected: 0 }));
+			} else {
+				doQuery(query, safeCompleted);
+			}
+		});
 	}
 
 	function doQuery(query, onCompleted) {
@@ -70,6 +80,19 @@ function wrapCommand(_context, connection) {
 			return onCompleted(null, { rowsAffected: affectedRows });
 		}
 	}
+
+	function enqueue(task) {
+		if (!connection.__orangeOrmQueue)
+			connection.__orangeOrmQueue = Promise.resolve();
+		connection.__orangeOrmQueue = connection.__orangeOrmQueue.then(() => new Promise((resolve) => {
+			try {
+				task(resolve);
+			}
+			catch (_e) {
+				resolve();
+			}
+		})).catch(() => {});
+	}
 }
 
 function extractError(e) {

package/src/tedious/wrapQuery.js

@@ -7,18 +7,28 @@ function wrapQuery(_context, connection) {
 	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);
-		}
+		enqueue(function(done) {
+			function safeCompleted(err, rows) {
+				try {
+					onCompleted(err, rows);
+				} finally {
+					done();
+				}
+			}
+
+			if (!CachedRequest || !CachedTypes) {
+				import('tedious')
+					.then(({ Request, TYPES }) => {
+						CachedRequest = Request;
+						CachedTypes = TYPES;
+						doQuery(query, safeCompleted);
+					})
+					.catch(err => safeCompleted(extractError(err), []));
+			}
+			else {
+				doQuery(query, safeCompleted);
+			}
+		});
 	}
 
 	function doQuery(query, onCompleted) {
@@ -119,6 +129,19 @@ function wrapQuery(_context, connection) {
 			}
 		}
 	}
+
+	function enqueue(task) {
+		if (!connection.__orangeOrmQueue)
+			connection.__orangeOrmQueue = Promise.resolve();
+		connection.__orangeOrmQueue = connection.__orangeOrmQueue.then(() => new Promise((resolve) => {
+			try {
+				task(resolve);
+			}
+			catch (_e) {
+				resolve();
+			}
+		})).catch(() => {});
+	}
 }
 
 // Helper functions remain the same
@@ -179,4 +202,4 @@ function addParameters(request, params, TYPES) {
 	}
 }
 
-module.exports = wrapQuery;
+module.exports = wrapQuery;

package/deno.lock

@@ -1,76 +0,0 @@
-{
-  "version": "5",
-  "specifiers": {
-    "jsr:@std/assert@*": "1.0.17",
-    "jsr:@std/assert@^1.0.17": "1.0.17",
-    "jsr:@std/internal@^1.0.12": "1.0.12",
-    "jsr:@std/path@*": "1.1.4",
-    "jsr:@std/testing@*": "1.0.17"
-  },
-  "jsr": {
-    "@std/assert@1.0.17": {
-      "integrity": "df5ebfffe77c03b3fa1401e11c762cc8f603d51021c56c4d15a8c7ab45e90dbe",
-      "dependencies": [
-        "jsr:@std/internal"
-      ]
-    },
-    "@std/internal@1.0.12": {
-      "integrity": "972a634fd5bc34b242024402972cd5143eac68d8dffaca5eaa4dba30ce17b027"
-    },
-    "@std/path@1.1.4": {
-      "integrity": "1d2d43f39efb1b42f0b1882a25486647cb851481862dc7313390b2bb044314b5",
-      "dependencies": [
-        "jsr:@std/internal"
-      ]
-    },
-    "@std/testing@1.0.17": {
-      "integrity": "87bdc2700fa98249d48a17cd72413352d3d3680dcfbdb64947fd0982d6bbf681",
-      "dependencies": [
-        "jsr:@std/assert@^1.0.17",
-        "jsr:@std/internal"
-      ]
-    }
-  },
-  "workspace": {
-    "packageJson": {
-      "dependencies": [
-        "npm:@cloudflare/workers-types@^4.20241106.0",
-        "npm:@electric-sql/pglite@0.3",
-        "npm:@lroal/on-change@^4.0.2",
-        "npm:@rollup/plugin-commonjs@^28.0.2",
-        "npm:@rollup/plugin-json@^6.1.0",
-        "npm:@rollup/plugin-node-resolve@13",
-        "npm:@tediousjs/connection-string@~0.4.1",
-        "npm:@types/express@^4.17.13",
-        "npm:@types/oracledb@^6.0.4",
-        "npm:@types/tedious@^4.0.14",
-        "npm:@typescript-eslint/eslint-plugin@6",
-        "npm:@typescript-eslint/parser@6",
-        "npm:@vitest/coverage-v8@^3.2.4",
-        "npm:ajv@^8.17.1",
-        "npm:axios@^1.6.2",
-        "npm:better-sqlite3@^11.8.1",
-        "npm:cors@^2.8.5",
-        "npm:eslint-plugin-jest@^27.1.7",
-        "npm:eslint@^8.57.0",
-        "npm:express@^4.18.2",
-        "npm:fast-json-patch@^3.1.1",
-        "npm:findup-sync@5",
-        "npm:glob@^10.3.4 || ^11.0.2",
-        "npm:module-definition@4 || 5 || * || 6",
-        "npm:msnodesqlv8@^4.1.0",
-        "npm:mysql2@^3.9.4",
-        "npm:oracledb@^6.3.0",
-        "npm:owasp-dependency-check@^0.0.21",
-        "npm:pg-query-stream@^3.3.2",
-        "npm:pg@^8.5.1",
-        "npm:rfdc@^1.2.0",
-        "npm:rollup@^2.52.7",
-        "npm:tedious@19",
-        "npm:typescript@^5.4.5",
-        "npm:uuid@^8.3.2 || 9 || 10 || ^11.1.0",
-        "npm:vitest@^3.2.4"
-      ]
-    }
-  }
-}