BL-164 #resolve

BL Compat module should coerce null values to empty string

src/main/bx/ModuleConfig.bx

@@ -83,7 +83,10 @@
 			// Choose your engine: adobe or lucee
 			engine = "lucee",
 			isLucee = false,
-			isAdobe = false
+			isAdobe = false,
+			// This simulates the query to empty value that Adobe/Lucee do when NOT in full null support
+			// We default it to true to simulate Adobe/Lucee behavior
+			queryNullToEmpty = true
 		};
 
 		/**

src/main/bx/interceptors/AdobeServerScope.bx

@@ -24,6 +24,17 @@ import java:ortus.boxlang.runtime.scopes.Key;
  */
 class{
 
+	/**
+	 * Injections by BoxLang
+	 */
+
+	property name;
+	property properties;
+	property log;
+	property interceptorService;
+	property boxRuntime;
+	property moduleRecord;
+
 	function configure(){
 		// Nothing to do here
 	}

src/main/bx/interceptors/LuceeServerScope.bx

@@ -24,6 +24,17 @@ import java:ortus.boxlang.runtime.scopes.Key;
  */
 class{
 
+	/**
+	 * Injections by BoxLang
+	 */
+
+	property name;
+	property properties;
+	property log;
+	property interceptorService;
+	property boxRuntime;
+	property moduleRecord;
+
 	function configure(){
 		// Nothing to do here
 	}

src/main/bx/interceptors/QueryCompat.bx

@@ -30,6 +30,17 @@ import java:ortus.boxlang.runtime.jdbc.QueryOptions;
  */
 class{
 
+	/**
+	 * Injections by BoxLang
+	 */
+
+	property name;
+	property properties;
+	property log;
+	property interceptorService;
+	property boxRuntime;
+	property moduleRecord;
+
 	function configure(){
 		// Nothing to do here
 	}
@@ -70,13 +81,13 @@ class{
 
 		/**
 		 * add cache attribute aliases:
-		 * 
+		 *
 		 * - `cacheId` -> `cacheKey`
 		 * - `cacheRegion` -> `cacheProvider`
 		 * - `cachedWithin` -> `cacheTimeout` OR `cachedWithin="request"` should also be implemented
 		 * - `cachedAfter` -> custom datetime check, followed by `cache=true, cacheTimeout=0`
 		*/
-		 
+
 		if( structOptions.keyExists( "cacheId" ) && !structOptions.keyExists( "cacheKey" ) ){
 			modifiedOptions.cacheKey = structOptions.cacheId;
 		}
@@ -108,12 +119,12 @@ class{
 
 	/**
 	 * Modify the query results before they are returned to the calling code.
-	 * 
+	 *
 	 * This is where we handle CFML compatibility features at the data level, such as:
-	 * 
+	 *
 	 * - converting null values to empty strings [BL-164](https://ortussolutions.atlassian.net/browse/BL-164)
 	 * - converting time values to the time specified in the `timezone` query option [BL-116](https://ortussolutions.atlassian.net/browse/BL-116)
-	 * 
+	 *
 	 * Incoming data:
 	 * - sql			:  The original, unmodified SQL string,
 	 * - bindings		:  Parameter binding values,
@@ -124,14 +135,18 @@ class{
 	 * - executedQuery	:  The BoxLang ExecutedQuery instance - https://s3.amazonaws.com/apidocs.ortussolutions.com/boxlang/1.0.0/ortus/boxlang/runtime/jdbc/ExecutedQuery.html
 	*/
 	function postQueryExecute( struct data ){
-		data.data.map( ( row ) -> {
-			row.each( ( key, value, row ) -> {
-				// CFML Compatibility: Convert null values to empty strings
-				if( isNull( row[ key ] ) ){
-					row[ key ] = "";
-				}
+
+		// Only active if the setting: queryNullToEmpty is true
+		if( properties.containsKey( "queryNullToEmpty" ) && properties.queryNullToEmpty ){
+			data.data.map( ( row ) -> {
+				row.each( ( key, value, row ) -> {
+					// CFML Compatibility: Convert null values to empty strings
+					if( isNull( row[ key ] ) ){
+						row[ key ] = "";
+					}
+				} );
+				return row;
 			} );
-			return row;
-		});
+		}
 	}
 }