fix(QueryBuilder): Use named parameters when passing to BaseGrammar

This avoids problems where custom Grammars have extra arguments and we add arguments to the official grammar
coldbox-modules · Jun 6, 2023 · 488743b · 488743b
1 parent 248eac2
commit 488743b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/models/Query/QueryBuilder.cfc b/models/Query/QueryBuilder.cfc
@@ -3543,18 +3543,18 @@ component displayname="QueryBuilder" accessors="true" {
     private any function runQuery( required string sql, struct options = {}, string returnObject = "query" ) {
         structAppend( arguments.options, getDefaultOptions(), false );
         var result = grammar.runQuery(
-            variables.sqlCommenter.appendSqlComments(
+            sql = variables.sqlCommenter.appendSqlComments(
                 sql,
                 arguments.options.keyExists( "datasource" ) && !isNull( arguments.options.datasource ) ? arguments.options.datasource : javacast(
                     "null",
                     ""
                 )
             ),
-            getBindings( except = getAggregate().isEmpty() ? [] : [ "select" ] ),
-            arguments.options,
-            returnObject,
-            variables.pretending,
-            function( data ) {
+            bindings = getBindings( except = getAggregate().isEmpty() ? [] : [ "select" ] ),
+            options = arguments.options,
+            returnObject = returnObject,
+            pretend = variables.pretending,
+            postProcessHook = function( data ) {
                 variables.queryLog.append( duplicate( data ) );
             }
         );