orange-orm 5.3.2 → 5.3.4

package/deno.lock

@@ -0,0 +1,75 @@
+{
+  "version": "5",
+  "specifiers": {
+    "jsr:@std/assert@*": "1.0.19",
+    "jsr:@std/assert@^1.0.17": "1.0.19",
+    "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.19": {
+      "integrity": "eaada96ee120cb980bc47e040f82814d786fe8162ecc53c91d8df60b8755991e",
+      "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:@hono/node-server@^1.14.4",
+        "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@^8.56.1",
+        "npm:@typescript-eslint/parser@^8.56.1",
+        "npm:@vitest/coverage-v8@^3.2.4",
+        "npm:ajv@^8.17.1",
+        "npm:axios@^1.6.2",
+        "npm:better-sqlite3@^12.6.2",
+        "npm:cors@^2.8.5",
+        "npm:eslint-plugin-jest@^29.15.0",
+        "npm:eslint@^8.57.0",
+        "npm:express@^4.18.2",
+        "npm:fast-json-patch@^3.1.1",
+        "npm:hono@^4.8.2",
+        "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"
+      ]
+    }
+  }
+}

package/dist/index.browser.mjs

@@ -7288,6 +7288,14 @@ function requireNewUpdateCommandCore () {
 			else if (engine === 'sqlite') {
 				command = command.append(separator + columnSql + ' IS ').append(encoded);
 			}
+			else if (engine === 'sap' && column.tsType === 'DateColumn') {
+				if (encoded.sql() === 'null') {
+					command = command.append(separator + columnSql + ' IS NULL');
+				}
+				else {
+					command = command.append(separator + column.formatOut(context) + '=').append(encoded);
+				}
+			}
 			else if (engine === 'sap' && column.tsType === 'JSONColumn') {
 				if (encoded.sql() === 'null') {
 					command = command.append(separator + columnSql + ' IS NULL');
@@ -8234,6 +8242,11 @@ function requireNewSingleCommandCore () {
 			if (engine === 'sqlite') {
 				return newParameterized(columnSql + ' IS ' + encoded.sql(), encoded.parameters);
 			}
+			if (engine === 'sap' && column.tsType === 'DateColumn') {
+				if (encoded.sql() === 'null')
+					return newParameterized(columnSql + ' IS NULL');
+				return newParameterized(column.formatOut(context) + '=' + encoded.sql(), encoded.parameters);
+			}
 			if (engine === 'sap' && column.tsType === 'JSONColumn') {
 				if (encoded.sql() === 'null')
 					return newParameterized(columnSql + ' IS NULL');
@@ -11830,9 +11843,6 @@ function requireGetManyDto$1 () {
 
 	async function decodeManyRelations(context, strategy, span) {
 		const maxParameters = getSessionSingleton(context, 'maxParameters');
-		const maxRows = maxParameters
-			? maxParameters * span.table._primaryColumns.length
-			: undefined;
 
 		const promises = [];
 		const c = {};
@@ -11852,6 +11862,10 @@ function requireGetManyDto$1 () {
 			const name = leg.name;
 			const table = span.table;
 			const relation = table._relations[name];
+			const parametersPerRow = relation.joinRelation.columns.length;
+			const maxRows = maxParameters
+				? Math.max(1, Math.floor((maxParameters - 1) / parametersPerRow))
+				: undefined;
 			const rowsMap = span._rowsMap;
 
 			const extractKey = createExtractKey(leg);

package/dist/index.mjs

@@ -7289,6 +7289,14 @@ function requireNewUpdateCommandCore () {
 			else if (engine === 'sqlite') {
 				command = command.append(separator + columnSql + ' IS ').append(encoded);
 			}
+			else if (engine === 'sap' && column.tsType === 'DateColumn') {
+				if (encoded.sql() === 'null') {
+					command = command.append(separator + columnSql + ' IS NULL');
+				}
+				else {
+					command = command.append(separator + column.formatOut(context) + '=').append(encoded);
+				}
+			}
 			else if (engine === 'sap' && column.tsType === 'JSONColumn') {
 				if (encoded.sql() === 'null') {
 					command = command.append(separator + columnSql + ' IS NULL');
@@ -8235,6 +8243,11 @@ function requireNewSingleCommandCore () {
 			if (engine === 'sqlite') {
 				return newParameterized(columnSql + ' IS ' + encoded.sql(), encoded.parameters);
 			}
+			if (engine === 'sap' && column.tsType === 'DateColumn') {
+				if (encoded.sql() === 'null')
+					return newParameterized(columnSql + ' IS NULL');
+				return newParameterized(column.formatOut(context) + '=' + encoded.sql(), encoded.parameters);
+			}
 			if (engine === 'sap' && column.tsType === 'JSONColumn') {
 				if (encoded.sql() === 'null')
 					return newParameterized(columnSql + ' IS NULL');
@@ -11831,9 +11844,6 @@ function requireGetManyDto$1 () {
 
 	async function decodeManyRelations(context, strategy, span) {
 		const maxParameters = getSessionSingleton(context, 'maxParameters');
-		const maxRows = maxParameters
-			? maxParameters * span.table._primaryColumns.length
-			: undefined;
 
 		const promises = [];
 		const c = {};
@@ -11853,6 +11863,10 @@ function requireGetManyDto$1 () {
 			const name = leg.name;
 			const table = span.table;
 			const relation = table._relations[name];
+			const parametersPerRow = relation.joinRelation.columns.length;
+			const maxRows = maxParameters
+				? Math.max(1, Math.floor((maxParameters - 1) / parametersPerRow))
+				: undefined;
 			const rowsMap = span._rowsMap;
 
 			const extractKey = createExtractKey(leg);
@@ -20915,7 +20929,7 @@ function requireNewTransaction$3 () {
 			rdb.pool = pool;
 		}
 		rdb.engine = 'mssqlNative';
-		rdb.maxParameters = 2100;
+		rdb.maxParameters = 2098;
 		rdb.encodeBoolean = encodeBoolean;
 		rdb.decodeJSON = decodeJSON;
 		rdb.encodeJSON = JSON.stringify;
@@ -21678,7 +21692,7 @@ function requireNewTransaction$2 () {
 			rdb.pool = pool;
 		}
 		rdb.engine = 'mssql';
-		rdb.maxParameters = 2100;
+		rdb.maxParameters = 2098;
 		rdb.encodeBoolean = encodeBoolean;
 		rdb.decodeJSON = decodeJSON;
 		rdb.encodeJSON = JSON.stringify;

package/docs/changelog.md

@@ -1,4 +1,8 @@
 ## Changelog
+__5.3.4__  
+SAP ASE: Fix optimistic concurrency for `date()` columns when datetime values are read back without millisecond precision.  
+__5.3.3__  
+MSSQL: Set `maxParameters` to `2098` because `tedious` adds extra parameters, so using `2100` can still exceed SQL Server's limit during `getMany`/`hasMany` loading.  
 __5.3.2__  
 Removed uuid dependency.  
 Upgraded to tedious@19.2.1 to reduce transitive audit vulnerabilities in the MSSQL driver chain.  

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "orange-orm",
-    "version": "5.3.2",
+    "version": "5.3.4",
     "publishConfig": {
         "access": "public"
     },

package/src/getManyDto.js

@@ -184,9 +184,6 @@ async function decode(context, strategy, span, rows, keys = rows.length > 0 ? Ob
 
 async function decodeManyRelations(context, strategy, span) {
 	const maxParameters = getSessionSingleton(context, 'maxParameters');
-	const maxRows = maxParameters
-		? maxParameters * span.table._primaryColumns.length
-		: undefined;
 
 	const promises = [];
 	const c = {};
@@ -206,6 +203,10 @@ async function decodeManyRelations(context, strategy, span) {
 		const name = leg.name;
 		const table = span.table;
 		const relation = table._relations[name];
+		const parametersPerRow = relation.joinRelation.columns.length;
+		const maxRows = maxParameters
+			? Math.max(1, Math.floor((maxParameters - 1) / parametersPerRow))
+			: undefined;
 		const rowsMap = span._rowsMap;
 
 		const extractKey = createExtractKey(leg);

package/src/mssql/newTransaction.js

@@ -19,7 +19,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 		rdb.pool = pool;
 	}
 	rdb.engine = 'mssqlNative';
-	rdb.maxParameters = 2100;
+	rdb.maxParameters = 2098;
 	rdb.encodeBoolean = encodeBoolean;
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;

package/src/table/commands/delete/singleCommand/newSingleCommandCore.js

@@ -66,6 +66,11 @@ function newSingleCommandCore(context, table, filter, alias, concurrencyState) {
 		if (engine === 'sqlite') {
 			return newParameterized(columnSql + ' IS ' + encoded.sql(), encoded.parameters);
 		}
+		if (engine === 'sap' && column.tsType === 'DateColumn') {
+			if (encoded.sql() === 'null')
+				return newParameterized(columnSql + ' IS NULL');
+			return newParameterized(column.formatOut(context) + '=' + encoded.sql(), encoded.parameters);
+		}
 		if (engine === 'sap' && column.tsType === 'JSONColumn') {
 			if (encoded.sql() === 'null')
 				return newParameterized(columnSql + ' IS NULL');

package/src/table/commands/newUpdateCommandCore.js

@@ -90,6 +90,14 @@ function newUpdateCommandCore(context, table, columns, row, concurrencyState) {
 		else if (engine === 'sqlite') {
 			command = command.append(separator + columnSql + ' IS ').append(encoded);
 		}
+		else if (engine === 'sap' && column.tsType === 'DateColumn') {
+			if (encoded.sql() === 'null') {
+				command = command.append(separator + columnSql + ' IS NULL');
+			}
+			else {
+				command = command.append(separator + column.formatOut(context) + '=').append(encoded);
+			}
+		}
 		else if (engine === 'sap' && column.tsType === 'JSONColumn') {
 			if (encoded.sql() === 'null') {
 				command = command.append(separator + columnSql + ' IS NULL');

package/src/tedious/newTransaction.js

@@ -19,7 +19,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 		rdb.pool = pool;
 	}
 	rdb.engine = 'mssql';
-	rdb.maxParameters = 2100;
+	rdb.maxParameters = 2098;
 	rdb.encodeBoolean = encodeBoolean;
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;