Merge pull request #70 from clickbar/allow-sthaving-to-use-st-express…

…ions feat(stHaving): Allow using ST, Boxes and Geometries as value
clickbar · Jan 19, 2024 · 8e5db16 · 8e5db16
2 parents 02b9eef + dd5835b
commit 8e5db16
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Added `as` parameter for `stFrom` function
+- Aligned `stHaving` with `stWhere` to also accept string column and ST expressions, boxes and geometries as value
 
 ### Fixed
 - Fixed builder macro docblocks to use FQDN for an issue within laravel-ide-helper

diff --git a/src/Database/Builder/BuilderMacros.php b/src/Database/Builder/BuilderMacros.php
@@ -129,14 +129,18 @@ public function stGroupBy()
     public function stHaving()
     {
         /**
-         * @param  \Clickbar\Magellan\Database\MagellanExpressions\MagellanStringExpression|\Clickbar\Magellan\Database\MagellanExpressions\MagellanBooleanExpression|\Clickbar\Magellan\Database\MagellanExpressions\MagellanBBoxExpression|\Clickbar\Magellan\Database\MagellanExpressions\MagellanNumericExpression|\Clickbar\Magellan\Database\MagellanExpressions\MagellanGeometryExpression|\Clickbar\Magellan\Database\MagellanExpressions\MagellanGeometryOrBboxExpression  $magellanExpression
+         * @param  \Clickbar\Magellan\Database\MagellanExpressions\MagellanStringExpression|\Clickbar\Magellan\Database\MagellanExpressions\MagellanBooleanExpression|\Clickbar\Magellan\Database\MagellanExpressions\MagellanBBoxExpression|\Clickbar\Magellan\Database\MagellanExpressions\MagellanNumericExpression|\Clickbar\Magellan\Database\MagellanExpressions\MagellanGeometryExpression|\Clickbar\Magellan\Database\MagellanExpressions\MagellanGeometryOrBboxExpression|string  $magellanExpression
          * @param  mixed  $operator
          * @param  mixed  $value
          * @param  string|null  $boolean
          * @return static
          */
-        return function (MagellanStringExpression|MagellanBooleanExpression|MagellanBBoxExpression|MagellanNumericExpression|MagellanGeometryExpression|MagellanGeometryOrBboxExpression $magellanExpression, $operator = null, $value = null, $boolean = 'and') {
-            return $this->having($magellanExpression->invoke($this, 'having'), $operator, $value, $boolean);
+        return function (MagellanStringExpression|MagellanBooleanExpression|MagellanBBoxExpression|MagellanNumericExpression|MagellanGeometryExpression|MagellanGeometryOrBboxExpression|string $magellanExpression, $operator = null, $value = null, $boolean = 'and') {
+            return $this->having(
+                BuilderUtils::evaluate($this, $magellanExpression, 'having'),
+                BuilderUtils::evaluate($this, $operator, 'having'),
+                BuilderUtils::evaluate($this, $value, 'having'),
+                $boolean);
         };
     }