Bugfix: Model spatial column update using Expression (#81)

* add test * Fix --------- Co-authored-by: Matan Yadaev <[email protected]>
MatanYadaev · Feb 16, 2023 · eec4775 · eec4775
1 parent 30b6cff
commit eec4775
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/GeometryCast.php b/src/GeometryCast.php
@@ -66,6 +66,10 @@ public function set($model, string $key, $value, array $attributes): ExpressionC
       $value = Geometry::fromArray($value);
     }
 
+    if ($value instanceof ExpressionContract) {
+      return $value;
+    }
+
     if (! ($value instanceof $this->className)) {
       $geometryType = is_object($value) ? $value::class : gettype($value);
       throw new InvalidArgumentException(

diff --git a/tests/GeometryCastTest.php b/tests/GeometryCastTest.php
@@ -27,6 +27,18 @@
   expect($testPlace->point)->toEqual($point2);
 });
 
+it('updates a model record with expression', function (): void {
+  $point = new Point(0, 180);
+  /** @var TestPlace $testPlace */
+  $testPlace = TestPlace::factory()->create(['point' => $point]);
+  $pointFromAttributes = $testPlace->getAttributes()['point'];
+
+  expect(function () use ($testPlace, $pointFromAttributes): void {
+    $testPlace->update(['point' => $pointFromAttributes]);
+  })->not->toThrow(InvalidArgumentException::class);
+  expect(true)->toBeTrue(); // because of Pest's bug: https://github.com/pestphp/pest/issues/657
+});
+
 it('updates a model record with null geometry', function (): void {
   $point = new Point(0, 180);
   /** @var TestPlace $testPlace */