Add aggregate method and DSL query support

Author: pdphilip

src/Eloquent/Docs/ModelDocs.php

@@ -15,6 +15,7 @@
  * Query Builder Methods ---------------------------------
  *
  * @method static $this query()
+ * @method static $this dslQuery()
  *-----------------------------------
  * @method static $this where($column, $operator = null, $value = null, $boolean = 'and', $options = [])
  * @method static $this whereNot($column, $operator = null, $value = null, $boolean = 'and', $options = [])
@@ -215,6 +216,7 @@
  * @method static int|array avg($columns)
  * @method static int|array average($columns)
  * @method static mixed agg(array $functions, $column)
+ * @method static mixed aggregate(array $functions, $column)
  *-----------------------------------
  * @method static mixed boxplot($columns, $options = [])
  * @method static mixed cardinality($columns, $options = [])

src/Query/Builder.php

@@ -718,8 +718,18 @@ public function avg($column, array $options = [])
         return $this->aggregate(__FUNCTION__, Arr::wrap($column), $options);
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * @param  string|array  $function
+     * @param  Expression|string|array  $columns
+     */
     public function aggregate($function, $columns = ['*'], $options = [])
     {
+        if (is_array($function)) {
+            return $this->aggregateMultiMetric($function, $columns, $options);
+        }
+
         return $this->aggregateMetric($function, $columns, $options);
     }
 
@@ -1920,6 +1930,9 @@ protected function aggregateMultiMetric(array $functions, string|array $columns,
                 ];
             }
         }
+        if ($this->asDsl) {
+            return $this->grammar->compileSelect($this);
+        }
 
         return $this->processor->processAggregations($this, $this->connection->select($this->grammar->compileSelect($this), []));
     }