fix(QueryBuilder): Fix incorrect structAppend overwrites

coldbox-modules · Jun 18, 2020 · ad770d2 · ad770d2
1 parent 004b045
commit ad770d2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/models/Grammars/AutoDiscover.cfc b/models/Grammars/AutoDiscover.cfc
@@ -4,7 +4,7 @@ component singleton {
     property name="grammar";
 
     function autoDiscoverGrammar() {
-        cfdbinfo( type="Version", name="local.dbInfo" );
+        cfdbinfo( type = "Version", name = "local.dbInfo" );
 
         switch ( dbInfo.DATABASE_PRODUCTNAME ) {
             case "MySQL":

diff --git a/models/Query/QueryBuilder.cfc b/models/Query/QueryBuilder.cfc
@@ -2152,7 +2152,7 @@ component displayname="QueryBuilder" accessors="true" {
      * @return query
      */
     public any function update( struct values = {}, struct options = {}, boolean toSql = false ) {
-        structAppend( arguments.values, variables.updates );
+        structAppend( arguments.values, variables.updates, false );
         var updateArray = arguments.values
             .keyArray()
             .map( function( column ) {
@@ -2636,7 +2636,7 @@ component displayname="QueryBuilder" accessors="true" {
      * @return       any
      */
     private any function runQuery( required string sql, struct options = {}, string returnObject = "query" ) {
-        structAppend( arguments.options, getDefaultOptions() );
+        structAppend( arguments.options, getDefaultOptions(), false );
         var result = grammar.runQuery(
             sql,
             getBindings(),

diff --git a/tests/specs/Query/Abstract/QueryDefaultsSpec.cfc b/tests/specs/Query/Abstract/QueryDefaultsSpec.cfc
@@ -18,6 +18,23 @@ component extends="testbox.system.BaseSpec" {
                 expect( options ).toHaveKey( "datasource" );
                 expect( options.datasource ).toBe( "foo" );
             } );
+
+            it( "can override default options at the call site", function() {
+                var grammar = getMockBox().createMock( "qb.models.Grammars.BaseGrammar" ).init();
+                var builder = getMockBox().createMock( "qb.models.Query.QueryBuilder" ).init( grammar );
+                builder.setDefaultOptions( { "datasource": "foo" } );
+                var expectedQuery = queryNew( "id", "integer", [ { id: 1 } ] );
+                grammar.$( "runQuery", expectedQuery );
+                builder
+                    .select( "id" )
+                    .from( "users" )
+                    .get( options = { "datasource": "bar" } );
+                expect( grammar.$once( "runQuery" ) ).toBeTrue( "runQuery should have been called once." );
+                var options = grammar.$callLog().runQuery[ 1 ][ 3 ];
+                expect( options ).toBeStruct();
+                expect( options ).toHaveKey( "datasource" );
+                expect( options.datasource ).toBe( "bar" );
+            } );
         } );
     }