option for raw arguments

'use_raw_arguments' = 1

this way, we can make query with aggregate function(s), datetime functions, etc.

Author: ngaspari

src/JsonQuery.php

@@ -65,13 +65,18 @@ public function search(): void
      */
     protected function appendParameterQueries(): void
     {
+        // enable raw arguments
+        // will use raw method rather then basic ones, in group_by and returns
+        // $builder->selectRaw, $builder->groupByRaw
+        $rawArguments = boolval($this->input['use_raw_arguments'] ?? false) ?? false;
+
         foreach ($this->registeredParameters as $requestParameter) {
             if (!$this->parameterExists($requestParameter)) {
                 // TODO: append config query?
                 continue;
             }
 
-            $this->instantiateRequestParameter($requestParameter)
+            $this->instantiateRequestParameter($requestParameter, $rawArguments)
                 ->run();
         }
     }
@@ -97,20 +102,20 @@ protected function parameterExists(string $requestParameter): bool
     }
 
     /**
-     * @param  $requestParameter
+     * @param string $requestParameter
+     * @param bool|null $rawArguments
      * @return AbstractParameter
-     *
      * @throws JsonQueryBuilderException
      */
-    protected function instantiateRequestParameter(string $requestParameter): AbstractParameter
+    protected function instantiateRequestParameter(string $requestParameter, ?bool $rawArguments = false): AbstractParameter
     {
         if (!is_subclass_of($requestParameter, AbstractParameter::class)) {
             throw new JsonQueryBuilderException("$requestParameter must extend " . AbstractParameter::class);
         }
 
         $input = $this->wrapInput($requestParameter::getParameterName());
 
-        return new $requestParameter($input, $this->builder, $this->modelConfig);
+        return new $requestParameter($input, $this->builder, $this->modelConfig, $rawArguments);
     }
 
     /**

src/RequestParameters/AbstractParameter.php

@@ -13,19 +13,21 @@ abstract class AbstractParameter
     public Builder     $builder;
     public ModelConfig $modelConfig;
     protected array    $arguments;
+    protected bool     $rawArguments;
 
     /**
-     * AbstractParameter constructor.
-     *
-     * @param  array  $arguments
-     * @param  Builder  $builder
-     * @param  ModelConfig  $modelConfig
+     * AbstractParameter constructor
+     * @param array $arguments
+     * @param Builder $builder
+     * @param ModelConfig $modelConfig
+     * @param bool|null $rawArguents
      */
-    public function __construct(array $arguments, Builder $builder, ModelConfig $modelConfig)
+    public function __construct(array $arguments, Builder $builder, ModelConfig $modelConfig, ?bool $rawArguments = false)
     {
         $this->arguments = $arguments;
         $this->builder = $builder;
         $this->modelConfig = $modelConfig;
+        $this->rawArguments = $rawArguments;
     }
 
     /**

src/RequestParameters/GroupByParameter.php

@@ -13,6 +13,13 @@ public static function getParameterName(): string
 
     protected function appendQuery(): void
     {
-        $this->builder->groupBy($this->arguments);
+        if (!$this->rawArguments) {
+            $this->builder->groupBy($this->arguments);
+        }
+        else {
+            foreach($this->arguments as $arg) {
+                $this->builder->groupByRaw($arg);
+            }
+        }
     }
 }

src/RequestParameters/ReturnsParameter.php

@@ -13,6 +13,13 @@ public static function getParameterName(): string
 
     protected function appendQuery(): void
     {
-        $this->builder->addSelect($this->arguments);
+        if (!$this->rawArguments) {
+            $this->builder->addSelect($this->arguments);
+        }
+        else {
+            foreach($this->arguments as $arg) {
+                $this->builder->selectRaw( $arg );
+            }
+        }
     }
 }