orange-orm 4.7.6 → 4.7.8-beta.0

package/dist/index.mjs

@@ -14833,11 +14833,10 @@ function requireWrapQuery$8 () {
 
 		async function runQuery(query, onCompleted) {
 			try {
-
+				log.emitQuery({ sql: query.sql(), parameters: query.parameters });
 				const sql = replaceParamChar(query, query.parameters);
 				let rdb = tryGetSessionContext(context);
 				let transactionHandler = rdb.transactionHandler;
-				log.emitQuery({ sql, parameters: query.parameters });
 
 				if (sql.length < 18 && query.parameters.length === 0) {
 					if (sql === 'BEGIN TRANSACTION' || sql === 'BEGIN') {
@@ -15337,13 +15336,13 @@ function requireWrapQuery$7 () {
 
 		function runQuery(query, onCompleted) {
 			var params = query.parameters;
+			log.emitQuery({sql: query.sql(), parameters: params});
 			var sql = replaceParamChar(query, params);
 			query = {
 				text: sql,
 				values: params,
 				types: query.types
 			};
-			log.emitQuery({sql, parameters: params});
 
 			runOriginalQuery.call(connection, query, onInnerCompleted);
 
@@ -18270,27 +18269,28 @@ function requireWrapQuery$1 () {
 		}
 
 		function doQuery(query, onCompleted) {
-			const result = [];
+			const results = []; // Array to hold multiple result sets
+			let currentResult = []; // Current result set being built
+			let hasResultSet = false; // Track if we're in an actual result set
+
+			log.emitQuery({ sql: query.sql(), parameters: query.parameters });
 			const sql = replaceParamChar(query.sql(), query.parameters);
 
 			// Transaction statements
 			if (sql.length < 18 && query.parameters.length === 0) {
 				if (sql === 'BEGIN TRANSACTION') {
-					log.emitQuery({ sql, parameters: [] });
 					connection.beginTransaction((err) => {
 						onCompleted(extractError(err), []);
 					});
 					return;
 				}
 				else if (sql === 'COMMIT') {
-					log.emitQuery({ sql, parameters: [] });
 					connection.commitTransaction((err) => {
 						onCompleted(extractError(err), []);
 					});
 					return;
 				}
 				else if (sql === 'ROLLBACK') {
-					log.emitQuery({ sql, parameters: [] });
 					connection.rollbackTransaction((err) => {
 						onCompleted(extractError(err), []);
 					});
@@ -18299,9 +18299,8 @@ function requireWrapQuery$1 () {
 			}
 
 			let keys;
-			// Now we can safely create Request using CachedRequest
 			var request = new CachedRequest(sql, onInnerCompleted);
-			const params = addParameters(request, query.parameters, CachedTypes);
+			addParameters(request, query.parameters, CachedTypes);
 
 			request.on('row', rows => {
 				const tmp = {};
@@ -18311,24 +18310,65 @@ function requireWrapQuery$1 () {
 				keys.forEach(cols => {
 					tmp[cols] = rows[cols].value;
 				});
-				result.push(tmp);
+				currentResult.push(tmp);
+				hasResultSet = true; // We're definitely in a result set
+			});
+
+			// Handle column metadata - indicates a result set is starting
+			request.on('columnMetadata', (_columns) => {
+				hasResultSet = true; // A result set is starting (even if it ends up empty)
+			});
+
+			// Handle end of each result set
+			request.on('doneInProc', (_rowCount, _more) => {
+				// End of a result set within a stored procedure
+				// Add to results if we had a result set (even if empty)
+				if (hasResultSet) {
+					results.push(currentResult);
+					currentResult = [];
+					keys = null; // Reset keys for next result set
+					hasResultSet = false; // Reset for next potential result set
+				}
+			});
+
+			request.on('doneProc', (_rowCount, _more) => {
+				// End of stored procedure execution
+				// Add to results if we had a result set (even if empty)
+				if (hasResultSet) {
+					results.push(currentResult);
+					currentResult = [];
+					hasResultSet = false; // Reset for next potential result set
+				}
 			});
 
-			log.emitQuery({ sql, parameters: params });
 			connection.execSql(request);
 
 			function onInnerCompleted(err) {
 				if (err) {
 					onCompleted(extractError(err));
 				} else {
-					onCompleted(null, result);
+					// If we have any remaining result set, add it
+					if (hasResultSet) {
+						results.push(currentResult);
+					}
+
+					// Return based on number of actual result sets
+					if (results.length === 0) {
+						// No result sets - return empty array
+						onCompleted(null, []);
+					} else if (results.length === 1) {
+						// Single result set - return as single-depth array (even if empty)
+						onCompleted(null, results[0]);
+					} else {
+						// Multiple result sets - return as array of arrays
+						onCompleted(null, results);
+					}
 				}
 			}
 		}
 	}
 
-	// same helpers as before
-
+	// Helper functions remain the same
 	function extractError(e) {
 		if (e && e.errors) {
 			return e.errors[0];
@@ -19697,8 +19737,8 @@ function requireWrapQuery () {
 
 		function runQuery(query, onCompleted) {
 			var params = query.parameters;
+			log.emitQuery({sql: query.sql(), parameters: params});
 			var sql = replaceParamChar(query, params);
-			log.emitQuery({ sql, parameters: params });
 
 			runOriginalQuery.call(connection, sql, params, {
 				fetchTypeHandler: function(metaData) {

package/docs/changelog.md

@@ -1,4 +1,6 @@
 ## Changelog
+__4.7.7__  
+Always do logging with question mark as placeholder instead of dialect specific placeholder.  
 __4.7.6__  
 Changed logging for SAP ASE.  
 __4.7.5__  

package/package.json

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

package/src/bunPg/wrapQuery.js

@@ -7,11 +7,10 @@ function wrapQuery(context, connection) {
 
 	async function runQuery(query, onCompleted) {
 		try {
-
+			log.emitQuery({ sql: query.sql(), parameters: query.parameters });
 			const sql = replaceParamChar(query, query.parameters);
 			let rdb = tryGetSessionContext(context);
 			let transactionHandler = rdb.transactionHandler;
-			log.emitQuery({ sql, parameters: query.parameters });
 
 			if (sql.length < 18 && query.parameters.length === 0) {
 				if (sql === 'BEGIN TRANSACTION' || sql === 'BEGIN') {

package/src/oracle/wrapQuery.js

@@ -7,8 +7,8 @@ function wrapQuery(_context, connection) {
 
 	function runQuery(query, onCompleted) {
 		var params = query.parameters;
+		log.emitQuery({sql: query.sql(), parameters: params});
 		var sql = replaceParamChar(query, params);
-		log.emitQuery({ sql, parameters: params });
 
 		runOriginalQuery.call(connection, sql, params, {
 			fetchTypeHandler: function(metaData) {

package/src/pg/wrapQuery.js

@@ -7,13 +7,13 @@ function wrapQuery(_context, connection) {
 
 	function runQuery(query, onCompleted) {
 		var params = query.parameters;
+		log.emitQuery({sql: query.sql(), parameters: params});
 		var sql = replaceParamChar(query, params);
 		query = {
 			text: sql,
 			values: params,
 			types: query.types
 		};
-		log.emitQuery({sql, parameters: params});
 
 		runOriginalQuery.call(connection, query, onInnerCompleted);
 

package/src/tedious/wrapQuery.js

@@ -22,27 +22,28 @@ function wrapQuery(_context, connection) {
 	}
 
 	function doQuery(query, onCompleted) {
-		const result = [];
+		const results = []; // Array to hold multiple result sets
+		let currentResult = []; // Current result set being built
+		let hasResultSet = false; // Track if we're in an actual result set
+
+		log.emitQuery({ sql: query.sql(), parameters: query.parameters });
 		const sql = replaceParamChar(query.sql(), query.parameters);
 
 		// Transaction statements
 		if (sql.length < 18 && query.parameters.length === 0) {
 			if (sql === 'BEGIN TRANSACTION') {
-				log.emitQuery({ sql, parameters: [] });
 				connection.beginTransaction((err) => {
 					onCompleted(extractError(err), []);
 				});
 				return;
 			}
 			else if (sql === 'COMMIT') {
-				log.emitQuery({ sql, parameters: [] });
 				connection.commitTransaction((err) => {
 					onCompleted(extractError(err), []);
 				});
 				return;
 			}
 			else if (sql === 'ROLLBACK') {
-				log.emitQuery({ sql, parameters: [] });
 				connection.rollbackTransaction((err) => {
 					onCompleted(extractError(err), []);
 				});
@@ -51,9 +52,8 @@ function wrapQuery(_context, connection) {
 		}
 
 		let keys;
-		// Now we can safely create Request using CachedRequest
 		var request = new CachedRequest(sql, onInnerCompleted);
-		const params = addParameters(request, query.parameters, CachedTypes);
+		addParameters(request, query.parameters, CachedTypes);
 
 		request.on('row', rows => {
 			const tmp = {};
@@ -63,24 +63,65 @@ function wrapQuery(_context, connection) {
 			keys.forEach(cols => {
 				tmp[cols] = rows[cols].value;
 			});
-			result.push(tmp);
+			currentResult.push(tmp);
+			hasResultSet = true; // We're definitely in a result set
+		});
+
+		// Handle column metadata - indicates a result set is starting
+		request.on('columnMetadata', (_columns) => {
+			hasResultSet = true; // A result set is starting (even if it ends up empty)
+		});
+
+		// Handle end of each result set
+		request.on('doneInProc', (_rowCount, _more) => {
+			// End of a result set within a stored procedure
+			// Add to results if we had a result set (even if empty)
+			if (hasResultSet) {
+				results.push(currentResult);
+				currentResult = [];
+				keys = null; // Reset keys for next result set
+				hasResultSet = false; // Reset for next potential result set
+			}
+		});
+
+		request.on('doneProc', (_rowCount, _more) => {
+			// End of stored procedure execution
+			// Add to results if we had a result set (even if empty)
+			if (hasResultSet) {
+				results.push(currentResult);
+				currentResult = [];
+				hasResultSet = false; // Reset for next potential result set
+			}
 		});
 
-		log.emitQuery({ sql, parameters: params });
 		connection.execSql(request);
 
 		function onInnerCompleted(err) {
 			if (err) {
 				onCompleted(extractError(err));
 			} else {
-				onCompleted(null, result);
+				// If we have any remaining result set, add it
+				if (hasResultSet) {
+					results.push(currentResult);
+				}
+
+				// Return based on number of actual result sets
+				if (results.length === 0) {
+					// No result sets - return empty array
+					onCompleted(null, []);
+				} else if (results.length === 1) {
+					// Single result set - return as single-depth array (even if empty)
+					onCompleted(null, results[0]);
+				} else {
+					// Multiple result sets - return as array of arrays
+					onCompleted(null, results);
+				}
 			}
 		}
 	}
 }
 
-// same helpers as before
-
+// Helper functions remain the same
 function extractError(e) {
 	if (e && e.errors) {
 		return e.errors[0];
@@ -132,4 +173,4 @@ function addParameters(request, params, TYPES) {
 	}
 }
 
-module.exports = wrapQuery;
+module.exports = wrapQuery;