Fix WireBox mapping for newly required returnFormat

coldbox-modules · Mar 10, 2017 · 61d8a14 · 61d8a14
1 parent 0493b4a
commit 61d8a14
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/ModuleConfig.cfc b/ModuleConfig.cfc
@@ -11,8 +11,7 @@ component {
     function configure() {
         settings = {
             defaultGrammar = "BaseGrammar",
-            returningArrays = true,
-            returnFormat = ""
+            returnFormat = "array"
         };
 
         binder.map( "BaseGrammar@qb" )
@@ -40,7 +39,8 @@ component {
         binder.map( "builder@qb" )
             .to( "qb.models.Query.Builder" )
             .initArg( name = "grammar", ref = "#settings.defaultGrammar#@qb" )
-            .initArg( name = "utils", ref = "QueryUtils@qb" );
+            .initArg( name = "utils", ref = "QueryUtils@qb" )
+            .initArg( name = "returnFormat", value = settings.returnFormat );
     }
 
 }
diff --git a/models/Query/Builder.cfc b/models/Query/Builder.cfc
@@ -18,11 +18,13 @@ component displayname="Builder" accessors="true" {
     property name="utils";
 
     /**
-    * Injected returnFormat callback, if any.
+    * returnFormat callback
     * If provided, the result of the callback is returned as the result of builder.
-    * @default ""
+    * Can optionally pass either "array" or "query"
+    * and the correct callback will be generated
+    * @default "array"
     */
-    property name="returnFormat" inject="coldbox:setting:returnFormat@qb";
+    property name="returnFormat";
 
     /******************** Query Properties ********************/
 
@@ -132,12 +134,13 @@ component displayname="Builder" accessors="true" {
     */
     public Builder function init(
         Grammar grammar = new qb.models.Query.Grammars.Grammar(),
-        QueryUtils utils = new qb.models.Query.QueryUtils()
+        QueryUtils utils = new qb.models.Query.QueryUtils(),
+        any returnFormat = "array"
     ) {
         variables.grammar = arguments.grammar;
         variables.utils = arguments.utils;
 
-        setReturnFormat( "array" );
+        setReturnFormat( arguments.returnFormat );
 
         setDefaultValues();