orange-orm 4.7.4 → 4.7.5-beta.0

package/dist/index.mjs

@@ -17435,6 +17435,7 @@ function requireWrapQuery$2 () {
 	if (hasRequiredWrapQuery$2) return wrapQuery_1$2;
 	hasRequiredWrapQuery$2 = 1;
 	var log = requireLog();
+	var getSessionSingleton = requireGetSessionSingleton();
 
 	function wrapQuery(_context, connection) {
 		var runOriginalQuery = connection.query;
@@ -17444,13 +17445,59 @@ function requireWrapQuery$2 () {
 			var params = query.parameters;
 			var sql = query.sql();
 			log.emitQuery({ sql, parameters: params });
-			const sap = connection.msnodesqlv8;
-			for (let i = 0; i < params.length; i++) {
-				const parameter = params[i];
-				if (typeof parameter === 'string')
-					params[i] = sap.VarChar(parameter);
+
+			// Helper function to check for non-ASCII UTF-8 characters
+			function hasNonAsciiCharacters(str) {
+				// Check if string contains any character with code point > 127 (non-ASCII)
+				return /[\u0080-\uFFFF]/.test(str);
+			}
+
+			function stringToHex(str) {
+				return Buffer.from(str, 'utf8').toString('hex');
+			}
+
+			const replacements = [];
+			const parametersToRemove = [];
+			const engine = getSessionSingleton(_context, 'engine');
+
+			if (engine === 'sap') {
+				//non-ASCII UTF-8 characters workaround
+				for (let i = 0; i < params.length; i++) {
+					const parameter = params[i];
+
+					if (typeof parameter === 'string' && hasNonAsciiCharacters(parameter)) {
+						const hexValue = stringToHex(parameter);
+						const convertClause = `CONVERT(VARCHAR(255), CONVERT(VARBINARY(127), 0x${hexValue}))`;
+
+						replacements.push({
+							index: i,
+							replacement: convertClause
+						});
+
+						parametersToRemove.push(i);
+					}
+				}
+			}
+
+			// Second pass: replace the ? placeholders at specific positions
+			if (replacements.length > 0) {
+				let questionMarkIndex = 0;
+				sql = sql.replace(/\?/g, (match) => {
+					const replacement = replacements.find(r => r.index === questionMarkIndex);
+					questionMarkIndex++;
+
+					if (replacement) {
+						return replacement.replacement;
+					}
+					return match;
+				});
 			}
 
+			// Remove parameters in reverse order to maintain correct indices
+			parametersToRemove.reverse().forEach(index => {
+				params.splice(index, 1);
+			});
+
 			runOriginalQuery.call(connection, sql, params, onInnerCompleted);
 			let result = [];
 

package/docs/changelog.md

@@ -1,4 +1,6 @@
 ## Changelog
+__4.7.5__  
+Implemented automatic hex conversion for non-ASCII UTF-8 characters in database parameters to resolve SAP ASE encoding issues.  
 __4.7.4__  
 Bugfix: SAP ASE: Do not throw errors on warnings. See [#129](https://github.com/alfateam/issues/129)  
 __4.7.3__  

package/package.json

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

package/src/mssql/wrapQuery.js

@@ -1,4 +1,5 @@
 var log = require('../table/log');
+var getSessionSingleton = require('../table/getSessionSingleton');
 
 function wrapQuery(_context, connection) {
 	var runOriginalQuery = connection.query;
@@ -8,13 +9,59 @@ function wrapQuery(_context, connection) {
 		var params = query.parameters;
 		var sql = query.sql();
 		log.emitQuery({ sql, parameters: params });
-		const sap = connection.msnodesqlv8;
-		for (let i = 0; i < params.length; i++) {
-			const parameter = params[i];
-			if (typeof parameter === 'string')
-				params[i] = sap.VarChar(parameter);
+
+		// Helper function to check for non-ASCII UTF-8 characters
+		function hasNonAsciiCharacters(str) {
+			// Check if string contains any character with code point > 127 (non-ASCII)
+			return /[\u0080-\uFFFF]/.test(str);
+		}
+
+		function stringToHex(str) {
+			return Buffer.from(str, 'utf8').toString('hex');
+		}
+
+		const replacements = [];
+		const parametersToRemove = [];
+		const engine = getSessionSingleton(_context, 'engine');
+
+		if (engine === 'sap') {
+			//non-ASCII UTF-8 characters workaround
+			for (let i = 0; i < params.length; i++) {
+				const parameter = params[i];
+
+				if (typeof parameter === 'string' && hasNonAsciiCharacters(parameter)) {
+					const hexValue = stringToHex(parameter);
+					const convertClause = `CONVERT(VARCHAR(255), CONVERT(VARBINARY(127), 0x${hexValue}))`;
+
+					replacements.push({
+						index: i,
+						replacement: convertClause
+					});
+
+					parametersToRemove.push(i);
+				}
+			}
 		}
 
+		// Second pass: replace the ? placeholders at specific positions
+		if (replacements.length > 0) {
+			let questionMarkIndex = 0;
+			sql = sql.replace(/\?/g, (match) => {
+				const replacement = replacements.find(r => r.index === questionMarkIndex);
+				questionMarkIndex++;
+
+				if (replacement) {
+					return replacement.replacement;
+				}
+				return match;
+			});
+		}
+
+		// Remove parameters in reverse order to maintain correct indices
+		parametersToRemove.reverse().forEach(index => {
+			params.splice(index, 1);
+		});
+
 		runOriginalQuery.call(connection, sql, params, onInnerCompleted);
 		let result = [];