fix support on builder update

mstaack · Jul 4, 2018 · 6261e1c · 6261e1c
1 parent a1c5e47
commit 6261e1c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/src/Eloquent/Builder.php b/src/Eloquent/Builder.php
@@ -9,26 +9,21 @@ public function update(array $values)
     {
         foreach ($values as $key => &$value) {
             if ($value instanceof GeometryInterface) {
-                $attrs = $this->getPostgisType($key);
-                $value = $this->asWKT($value, $attrs);
+                if (is_null($this->model)) {
+                    $value = $this->asWKT($value);
+                } else {
+                    $attrs = $this->model->getPostgisType($key);
+                    $value = $this->model->asWKT($value, $attrs);
+                }
             }
         }
 
         return parent::update($values);
     }
 
-    protected function getPostgisFields()
+    protected function asWKT(GeometryInterface $geometry)
     {
-        return $this->getModel()->getPostgisFields();
-    }
-
-    protected function getPostgisType($key)
-    {
-        return $this->getModel()->getPostgisType($key);
-    }
-
-    protected function asWKT(GeometryInterface $geometry, $attrs)
-    {
-        return $this->getModel()->asWKT($geometry, $attrs);
+        return $this->getQuery()->raw(sprintf("%s.ST_GeogFromText('%s')",
+                function_exists('config') ? config('postgis.schema') : 'public', $geometry->toWKT()));
     }
 }
diff --git a/src/Eloquent/PostgisTrait.php b/src/Eloquent/PostgisTrait.php
@@ -36,7 +36,7 @@ protected function geomFromText(GeometryInterface $geometry, $srid = 4326)
                 function_exists('config') ? config('postgis.schema') : 'public', $geometry->toWKT(), $srid));
     }
 
-    protected function asWKT(GeometryInterface $geometry, $attrs)
+    public function asWKT(GeometryInterface $geometry, $attrs)
     {
         switch (strtoupper($attrs['geomtype'])) {
             case 'GEOMETRY':