Implement group bys

coldbox-modules · Nov 29, 2016 · 73f961d · 73f961d
1 parent ed65e09
commit 73f961d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 24 deletions.
diff --git a/ModuleConfig.cfc b/ModuleConfig.cfc
@@ -8,30 +8,8 @@ component {
     this.autoMapModels = true;
     this.cfmapping     = 'Quick';
 
-    variables.defaultSettings = {
-        defaultGrammar = 'OracleGrammar'
-    };
-
     function configure() {
-        var settings = controller.getConfigSettings();
-
-        parseParentSettings(settings);
-
-        binder.map('Grammar@Quick')
-            .to('#moduleMapping#.models.Query.Grammars.#settings.quick.defaultGrammar#');
-    }
-
-    private void function parseParentSettings(required struct settings) {
-        if (! structKeyExists(settings, 'quick')) {
-            settings.quick = {};
-        }
-
-        var userSettings = controller.getSetting('ColdBoxConfig')
-            .getPropertyMixin('quick', 'variables', structNew());
-
-        structAppend(settings.quick, variables.defaultSettings);
-
-        structAppend(settings.quick, userSettings, true);
+        //
     }
 
 }
diff --git a/models/Query/Builder.cfc b/models/Query/Builder.cfc
@@ -8,6 +8,7 @@ component displayname="Builder" accessors="true" {
     property name="from" type="string";
     property name="joins" type="array";
     property name="wheres" type="array";
+    property name="groups" type="array";
 
     variables.operators = [
         "=", "<", ">", "<=", ">=", "<>", "!=",
@@ -41,6 +42,7 @@ component displayname="Builder" accessors="true" {
         variables.joins = [];
         variables.from = "";
         variables.wheres = [];
+        variables.groups = [];
     }
 
     // API
@@ -465,6 +467,26 @@ component displayname="Builder" accessors="true" {
         return condition ? onTrue( this ) : onFalse( this );
     }
 
+    // group by
+
+    public Builder function groupBy() {
+        // This block is necessary for ACF 10.
+        // It can't be extracted to a function because
+        // the arguments struct doesn't get passed correctly.
+        var args = {};
+        var count = structCount( arguments );
+        for ( var arg in arguments ) {
+            args[ count ] = arguments[ arg ];
+            count--;
+        }
+
+        var groupBys = normalizeToArray( argumentCollection = args );
+        groupBys.each( function( groupBy ) {
+            variables.groups.append( groupBy );
+        } );
+        return this;
+    }
+
     public Builder function newQuery() {
         return new Quick.models.Query.Builder( grammar = getGrammar() );
     }

diff --git a/models/Query/Grammars/Grammar.cfc b/models/Query/Grammars/Grammar.cfc
@@ -3,7 +3,7 @@ component displayname="Grammar" accessors="true" {
     property name="tablePrefix" type="string" default="";
 
     variables.selectComponents = [
-        "columns", "from", "joins", "wheres"
+        "columns", "from", "joins", "wheres", "groups"
     ];
 
     public Grammar function init() {
@@ -159,6 +159,14 @@ component displayname="Grammar" accessors="true" {
         return "#wrapColumn( where.column )# NOT IN (#compileSelect( where.query )#)";
     }
 
+    private string function compileGroups( required Builder query, required array groups ) {
+        if ( groups.isEmpty() ) {
+            return "";
+        }
+
+        return "GROUP BY #groups.map( wrapColumn ).toList( ", " )#";
+    }
+
     private string function concatenate( required array sql ) {
         return arrayToList( arrayFilter( sql, function( item ) {
             return item != "";