Merge branch 'main' into patch/upsert-raw-return-expressions

coldbox-modules · Sep 11, 2024 · 373ce21 · 373ce21
2 parents 9f3a7b2 + ee1bc72
commit 373ce21
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/models/Query/QueryUtils.cfc b/models/Query/QueryUtils.cfc
@@ -93,7 +93,7 @@ component singleton displayname="QueryUtils" accessors="true" {
             return arguments.value.getBindings();
         }
 
-        var binding = "";
+        var binding = {};
         if ( isStruct( value ) ) {
             if ( structKeyExists( value, "isExpression" ) && value.isExpression == true ) {
                 return value;
@@ -103,7 +103,10 @@ component singleton displayname="QueryUtils" accessors="true" {
             binding = { value: normalizeSqlValue( value ) };
         }
 
-        structAppend( binding, { cfsqltype: inferSqlType( binding.value ), list: false, null: false }, false );
+        if ( !structKeyExists( binding, "cfsqltype" ) ) {
+            binding.cfsqltype = inferSqlType( binding.value );
+        }
+        structAppend( binding, { list: false, null: false }, false );
 
         if ( variables.autoAddScale && isFloatingPoint( binding ) ) {
             param binding.scale = calculateNumberOfDecimalDigits( binding );