fix(QueryBuilder): Better whitespace splitting for select lists

coldbox-modules · Dec 20, 2019 · 6f771e3 · 6f771e3
1 parent 74649bd
commit 6f771e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/models/Query/QueryBuilder.cfc b/models/Query/QueryBuilder.cfc
@@ -2570,9 +2570,9 @@ component displayname="QueryBuilder" accessors="true" {
         }
 
         try {
-            var cfArray = [];
-            cfArray.append( trim( arguments.listOrArray ).split( ",\s*" ), true );
-            return cfArray;
+            return arrayMap( trim( arguments.listOrArray ).split( ",\s*" ), function( item ) {
+                return trim( item );
+            } );
         } catch ( any e ) {
             return arguments.listOrArray;
         }

diff --git a/tests/specs/Query/Abstract/BuilderSelectSpec.cfc b/tests/specs/Query/Abstract/BuilderSelectSpec.cfc
@@ -25,8 +25,9 @@ component extends="testbox.system.BaseSpec" {
                     it( "trims a list before splitting it", function() {
                         query.select( "
                             ::some_column::, ::another_column::
+                            ,::third_column::
                         " );
-                        expect( query.getColumns() ).toBe( [ "::some_column::", "::another_column::" ] );
+                        expect( query.getColumns() ).toBe( [ "::some_column::", "::another_column::", "::third_column::" ] );
                     } );
 
                     it( "using an array", function() {