fix(QueryBuilder): 'value' and 'values' now work with column formatters

coldbox-modules · Jun 19, 2020 · da60695 · da60695
1 parent 977edcf
commit da60695
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 4 deletions.
diff --git a/models/Query/QueryBuilder.cfc b/models/Query/QueryBuilder.cfc
@@ -2528,7 +2528,8 @@ component displayname="QueryBuilder" accessors="true" {
         struct options = {}
     ) {
         return withReturnFormat( "query", function() {
-            select( column );
+            var formattedColumn = applyColumnFormatter( column );
+            select( formattedColumn );
             var data = first( options = options );
             if ( structIsEmpty( data ) ) {
                 if ( throwWhenNotFound ) {
@@ -2540,7 +2541,7 @@ component displayname="QueryBuilder" accessors="true" {
                     return defaultValue;
                 }
             } else {
-                return data[ listLast( column, "." ) ];
+                return data[ listLast( formattedColumn, "." ) ];
             }
         } );
     }
@@ -2555,9 +2556,10 @@ component displayname="QueryBuilder" accessors="true" {
      */
     public array function values( required string column, struct options = {} ) {
         return withReturnFormat( "query", function() {
-            var columnName = listLast( column, "." );
-            select( column );
+            var formattedColumn = applyColumnFormatter( column );
+            select( formattedColumn );
             var result = get( options = options );
+            var columnName = listLast( formattedColumn, "." );
             var results = [];
             for ( var row in result ) {
                 results.append( row[ columnName ] );

diff --git a/tests/specs/Query/Abstract/QueryExecutionSpec.cfc b/tests/specs/Query/Abstract/QueryExecutionSpec.cfc
@@ -189,6 +189,30 @@ component extends="testbox.system.BaseSpec" {
                     expect( runQueryLog[ 1 ] ).toBe( { sql: "SELECT ""some_table"".""name"" FROM ""users"" LIMIT 1", options: {} } );
                 } );
 
+                it( "returns the first value when the column is changed by a column formatter", function() {
+                    var builder = getBuilder();
+                    var expectedQuery = queryNew( "name", "varchar", [ { name: "foo" } ] );
+                    // writeDump( var = expectedQuery, abort = true );
+                    builder
+                        .$( "runQuery" )
+                        .$args( sql = "SELECT ""some_table"".""name"" FROM ""users"" LIMIT 1", options = {} )
+                        .$results( expectedQuery );
+
+                    var results = builder
+                        .setColumnFormatter( function( column ) {
+                            return "some_table.name";
+                        } )
+                        .from( "users" )
+                        .value( "different" );
+
+                    expect( results ).toBe( "foo" );
+
+                    var runQueryLog = builder.$callLog().runQuery;
+                    expect( runQueryLog ).toBeArray();
+                    expect( runQueryLog ).toHaveLength( 1, "runQuery should have been called once" );
+                    expect( runQueryLog[ 1 ] ).toBe( { sql: "SELECT ""some_table"".""name"" FROM ""users"" LIMIT 1", options: {} } );
+                } );
+
                 it( "returns the defaultValue when calling value with an empty query", function() {
                     var builder = getBuilder();
                     var expectedQuery = queryNew( "name", "varchar", [] );
@@ -281,6 +305,28 @@ component extends="testbox.system.BaseSpec" {
                     expect( runQueryLog ).toHaveLength( 1, "runQuery should have been called once" );
                     expect( runQueryLog[ 1 ] ).toBe( { sql: "SELECT ""some_table"".""name"" FROM ""users""", options: {} } );
                 } );
+
+                it( "can return an array of values when the column formatter changes the column name", function() {
+                    var builder = getBuilder();
+                    var expectedQuery = queryNew( "name", "varchar", [ { name: "foo" }, { name: "bar" } ] );
+                    builder
+                        .$( "runQuery" )
+                        .$args( sql = "SELECT ""some_table"".""name"" FROM ""users""", options = {} )
+                        .$results( expectedQuery );
+
+                    var results = builder
+                        .setColumnFormatter( function( column ) {
+                            return "some_table.name";
+                        } )
+                        .from( "users" )
+                        .values( "different" );
+                    expect( results ).toBe( [ "foo", "bar" ] );
+
+                    var runQueryLog = builder.$callLog().runQuery;
+                    expect( runQueryLog ).toBeArray();
+                    expect( runQueryLog ).toHaveLength( 1, "runQuery should have been called once" );
+                    expect( runQueryLog[ 1 ] ).toBe( { sql: "SELECT ""some_table"".""name"" FROM ""users""", options: {} } );
+                } );
             } );
 
             describe( "implode", function() {