orange-orm 4.7.4 → 4.7.5-beta.1

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;
@@ -17443,14 +17444,99 @@ function requireWrapQuery$2 () {
 		function runQuery(query, onCompleted) {
 			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);
+
+			const replacements = [];
+			const parametersToRemove = [];
+			const engine = getSessionSingleton(_context, 'engine');
+
+			if (engine === 'sap') {
+				const sap = connection.msnodesqlv8;
+				// Helper function to check for non-ASCII UTF-8 characters
+
+				// Check if this is a stored procedure call
+				const isStoredProcCall = /EXECUTE\s+/i.test(sql) || /EXEC\s+/i.test(sql);
+				let hexVariables = [];
+
+				// Non-ASCII UTF-8 characters workaround
+				for (let i = 0; i < params.length; i++) {
+					const parameter = params[i];
+
+					if (typeof parameter === 'string') {
+						if (hasNonAsciiCharacters(parameter)) {
+
+							const hexValue = stringToHex(parameter);
+
+							if (isStoredProcCall) {
+								// For stored procedures, create a variable
+								const varName = `@hex_param_${i}`;
+								const convertClause = `CONVERT(VARCHAR(255), CONVERT(VARBINARY(127), 0x${hexValue}))`;
+
+								hexVariables.push({
+									declaration: `DECLARE ${varName} VARCHAR(255)`,
+									assignment: `SET ${varName} = ${convertClause}`
+								});
+
+								replacements.push({
+									index: i,
+									replacement: varName
+								});
+							} else {
+								// For regular queries, use inline conversion
+								const convertClause = `CONVERT(VARCHAR(255), CONVERT(VARBINARY(127), 0x${hexValue}))`;
+								replacements.push({
+									index: i,
+									replacement: convertClause
+								});
+							}
+							parametersToRemove.push(i);
+						}
+						else
+							params[i] = sap.VarChar(parameter);
+					}
+				}
+
+				// Apply replacements
+				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;
+					});
+
+					// For stored procedures, inject hex variable declarations
+					if (isStoredProcCall && hexVariables.length > 0) {
+						const lines = sql.split('\n');
+						let insertIndex = 0;
+
+						// Find the last DECLARE statement
+						for (let i = 0; i < lines.length; i++) {
+							if (/^\s*DECLARE\s+/i.test(lines[i])) {
+								insertIndex = i + 1;
+							}
+						}
+
+						// Insert hex variable declarations and assignments
+						const hexDeclarations = hexVariables.map(v => v.declaration);
+						const hexAssignments = hexVariables.map(v => v.assignment);
+
+						lines.splice(insertIndex, 0, ...hexDeclarations, ...hexAssignments);
+						sql = lines.join('\n');
+					}
+				}
+
+				// Remove parameters in reverse order to maintain correct indices
+				parametersToRemove.reverse().forEach(index => {
+					params.splice(index, 1);
+				});
 			}
 
+			log.emitQuery({ sql, parameters: params });
+
 			runOriginalQuery.call(connection, sql, params, onInnerCompleted);
 			let result = [];
 
@@ -17464,7 +17550,6 @@ function requireWrapQuery$2 () {
 				}
 				result.push(rows);
 				if (!hasMore) {
-
 					if (result.length === 1)
 						onCompleted(null, result[0]);
 					else
@@ -17472,9 +17557,18 @@ function requireWrapQuery$2 () {
 				}
 			}
 		}
+	}
 
+	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');
+	}
+
+
 	wrapQuery_1$2 = wrapQuery;
 	return wrapQuery_1$2;
 }

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.1",
   "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;
@@ -7,14 +8,99 @@ function wrapQuery(_context, connection) {
 	function runQuery(query, onCompleted) {
 		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);
+
+		const replacements = [];
+		const parametersToRemove = [];
+		const engine = getSessionSingleton(_context, 'engine');
+
+		if (engine === 'sap') {
+			const sap = connection.msnodesqlv8;
+			// Helper function to check for non-ASCII UTF-8 characters
+
+			// Check if this is a stored procedure call
+			const isStoredProcCall = /EXECUTE\s+/i.test(sql) || /EXEC\s+/i.test(sql);
+			let hexVariables = [];
+
+			// Non-ASCII UTF-8 characters workaround
+			for (let i = 0; i < params.length; i++) {
+				const parameter = params[i];
+
+				if (typeof parameter === 'string') {
+					if (hasNonAsciiCharacters(parameter)) {
+
+						const hexValue = stringToHex(parameter);
+
+						if (isStoredProcCall) {
+							// For stored procedures, create a variable
+							const varName = `@hex_param_${i}`;
+							const convertClause = `CONVERT(VARCHAR(255), CONVERT(VARBINARY(127), 0x${hexValue}))`;
+
+							hexVariables.push({
+								declaration: `DECLARE ${varName} VARCHAR(255)`,
+								assignment: `SET ${varName} = ${convertClause}`
+							});
+
+							replacements.push({
+								index: i,
+								replacement: varName
+							});
+						} else {
+							// For regular queries, use inline conversion
+							const convertClause = `CONVERT(VARCHAR(255), CONVERT(VARBINARY(127), 0x${hexValue}))`;
+							replacements.push({
+								index: i,
+								replacement: convertClause
+							});
+						}
+						parametersToRemove.push(i);
+					}
+					else
+						params[i] = sap.VarChar(parameter);
+				}
+			}
+
+			// Apply replacements
+			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;
+				});
+
+				// For stored procedures, inject hex variable declarations
+				if (isStoredProcCall && hexVariables.length > 0) {
+					const lines = sql.split('\n');
+					let insertIndex = 0;
+
+					// Find the last DECLARE statement
+					for (let i = 0; i < lines.length; i++) {
+						if (/^\s*DECLARE\s+/i.test(lines[i])) {
+							insertIndex = i + 1;
+						}
+					}
+
+					// Insert hex variable declarations and assignments
+					const hexDeclarations = hexVariables.map(v => v.declaration);
+					const hexAssignments = hexVariables.map(v => v.assignment);
+
+					lines.splice(insertIndex, 0, ...hexDeclarations, ...hexAssignments);
+					sql = lines.join('\n');
+				}
+			}
+
+			// Remove parameters in reverse order to maintain correct indices
+			parametersToRemove.reverse().forEach(index => {
+				params.splice(index, 1);
+			});
 		}
 
+		log.emitQuery({ sql, parameters: params });
+
 		runOriginalQuery.call(connection, sql, params, onInnerCompleted);
 		let result = [];
 
@@ -28,7 +114,6 @@ function wrapQuery(_context, connection) {
 			}
 			result.push(rows);
 			if (!hasMore) {
-
 				if (result.length === 1)
 					onCompleted(null, result[0]);
 				else
@@ -36,7 +121,16 @@ function wrapQuery(_context, connection) {
 			}
 		}
 	}
+}
 
+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');
+}
+
+
 module.exports = wrapQuery;