Remove the need to return a query in a when callback.

coldbox-modules · Nov 29, 2016 · 657d47c · 657d47c
1 parent e19dae3
commit 657d47c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/models/Query/Builder.cfc b/models/Query/Builder.cfc
@@ -479,7 +479,12 @@ component displayname="Builder" accessors="true" {
         onTrue,
         onFalse = function( q ) { return q; }
     ) {
-        return condition ? onTrue( this ) : onFalse( this );
+        if ( condition ) {
+            onTrue( this );
+        } else {
+            onFalse( this );
+        }
+        return this;
     }
 
     // group by

diff --git a/tests/specs/Query/Builder+GrammarSpec.cfc b/tests/specs/Query/Builder+GrammarSpec.cfc
@@ -550,7 +550,7 @@ component extends="testbox.system.BaseSpec" {
                 describe( """when"" callbacks", function() {
                     it( "executes the callback when the condition is true", function() {
                         var callback = function( query ) {
-                            return query.where( "id", "=", 1 );
+                            query.where( "id", "=", 1 );
                         };
 
                         var builder = getBuilder();
@@ -566,7 +566,7 @@ component extends="testbox.system.BaseSpec" {
 
                     it( "does not execute the callback when the condition is false", function() {
                         var callback = function( query ) {
-                            return query.where( "id", "=", 1 );
+                            query.where( "id", "=", 1 );
                         };
 
                         var builder = getBuilder();
@@ -582,11 +582,11 @@ component extends="testbox.system.BaseSpec" {
 
                     it( "executes the default callback when the condition is false", function() {
                         var callback = function( query ) {
-                            return query.where( "id", "=", 1 );
+                            query.where( "id", "=", 1 );
                         };
 
                         var default = function( query ) {
-                            return query.where( "id", "=", 2 );
+                            query.where( "id", "=", 2 );
                         };
 
                         var builder = getBuilder();
@@ -602,11 +602,11 @@ component extends="testbox.system.BaseSpec" {
 
                     it( "does not execute the default callback when the condition is true", function() {
                         var callback = function( query ) {
-                            return query.where( "id", "=", 1 );
+                            query.where( "id", "=", 1 );
                         };
 
                         var default = function( query ) {
-                            return query.where( "id", "=", 2 );
+                            query.where( "id", "=", 2 );
                         };
 
                         var builder = getBuilder();